diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-08-16 20:59:14 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-08-16 20:59:14 +0200 |
| commit | 6cd9d0f77d527491d0c3626f16b8e125a8a9344b (patch) | |
| tree | e04b39fcca94286964637d092a67abbe5eff109f /tests/fate.mak | |
| parent | ad42126abcdee921fd7eaf0b8a83f18aa3dc1371 (diff) | |
| download | ffmpeg-6cd9d0f77d527491d0c3626f16b8e125a8a9344b.tar.gz | |
Revert "avconv: use stream copy by default when possible."
This reverts commit 4f4f33844a7369e5579912cc02f3c5376b1e6872.
This commit has some ugly corner cases and needs to be discussed
further.
Diffstat (limited to 'tests/fate.mak')
| -rw-r--r-- | tests/fate.mak | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/fate.mak b/tests/fate.mak index 8fec278b39..0e3331178b 100644 --- a/tests/fate.mak +++ b/tests/fate.mak @@ -189,7 +189,7 @@ fate-msvideo1-8bit: CMD = framecrc -i $(SAMPLES)/cram/skating.avi -t 1 -pix_fmt FATE_TESTS += fate-mszh fate-mszh: CMD = framecrc -i $(SAMPLES)/lcl/mszh-1frame.avi FATE_TESTS += fate-mtv -fate-mtv: CMD = framecrc -i $(SAMPLES)/mtv/comedian_auto-partial.mtv -vcodec rawvideo -acodec copy -pix_fmt rgb24 +fate-mtv: CMD = framecrc -i $(SAMPLES)/mtv/comedian_auto-partial.mtv -acodec copy -pix_fmt rgb24 FATE_TESTS += fate-mxf-demux fate-mxf-demux: CMD = framecrc -i $(SAMPLES)/mxf/C0023S01.mxf -acodec copy -vcodec copy FATE_TESTS += fate-nc-demux @@ -197,7 +197,7 @@ fate-nc-demux: CMD = framecrc -i $(SAMPLES)/nc-camera/nc-sample-partial -vcodec FATE_TESTS += fate-nsv-demux fate-nsv-demux: CMD = framecrc -i $(SAMPLES)/nsv/witchblade-51kbps.nsv -t 6 -vcodec copy -acodec copy FATE_TESTS += fate-nuv -fate-nuv: CMD = framecrc -idct simple -i $(SAMPLES)/nuv/Today.nuv -acodec pcm_s16le +fate-nuv: CMD = framecrc -idct simple -i $(SAMPLES)/nuv/Today.nuv FATE_TESTS += fate-oma-demux fate-oma-demux: CMD = crc -i $(SAMPLES)/oma/01-Untitled-partial.oma -acodec copy FATE_TESTS += fate-pcm_dvd |