aboutsummaryrefslogtreecommitdiffstats
path: root/tests/fate/vorbis.mak
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-01-06 23:41:19 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-01-06 23:41:19 +0100
commita2aeaff40f34cb54bef55240f9cb8046385087d7 (patch)
tree8c7543ed2aa6030829ba402ec70d028864cd2dad /tests/fate/vorbis.mak
parent58edabb198e0c881d8bb6ae8a88df037c24c71eb (diff)
parentaa15afb7ce850e2ac688efdef189df5da817a646 (diff)
downloadffmpeg-a2aeaff40f34cb54bef55240f9cb8046385087d7.tar.gz
Merge commit 'aa15afb7ce850e2ac688efdef189df5da817a646'n1.2-dev
* commit 'aa15afb7ce850e2ac688efdef189df5da817a646': 4xm: simplify code with FFSWAP 4xm: return meaningful error codes Conflicts: libavcodec/4xm.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/vorbis.mak')
0 files changed, 0 insertions, 0 deletions