Changeset 60ef0c6f in ffmpeg

Timestamp:

Apr 9, 2014, 11:58:55 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

59a53842

Parents:

c740e083 (diff), 60fd7d36 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (04/09/14 11:40:04)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (04/09/14 11:58:55)

Message:

Merge commit '60fd7d36c47d62d4c603bf16c213b1a924f5cfcf'

• commit '60fd7d36c47d62d4c603bf16c213b1a924f5cfcf': fate: correctly set sample rate for mp2 tests

Conflicts:

tests/fate/acodec.mak
tests/lavf-regression.sh

one hunk has been ommited as it breaks fate

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)