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/codec-regression.sh | |
| parent | ad42126abcdee921fd7eaf0b8a83f18aa3dc1371 (diff) | |
| download | android_external_ffmpeg-6cd9d0f77d527491d0c3626f16b8e125a8a9344b.tar.gz android_external_ffmpeg-6cd9d0f77d527491d0c3626f16b8e125a8a9344b.tar.bz2 android_external_ffmpeg-6cd9d0f77d527491d0c3626f16b8e125a8a9344b.zip | |
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/codec-regression.sh')
| -rwxr-xr-x | tests/codec-regression.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh index 881591e798..708509c29d 100755 --- a/tests/codec-regression.sh +++ b/tests/codec-regression.sh @@ -320,12 +320,12 @@ fi if [ -n "$do_wmav1" ] ; then do_audio_encoding wmav1.asf "-acodec wmav1" -do_avconv_nomd5 $pcm_dst $DEC_OPTS -i $target_path/$file -f wav -acodec pcm_s16le +do_avconv_nomd5 $pcm_dst $DEC_OPTS -i $target_path/$file -f wav $tiny_psnr $pcm_dst $pcm_ref 2 8192 fi if [ -n "$do_wmav2" ] ; then do_audio_encoding wmav2.asf "-acodec wmav2" -do_avconv_nomd5 $pcm_dst $DEC_OPTS -i $target_path/$file -f wav -acodec pcm_s16le +do_avconv_nomd5 $pcm_dst $DEC_OPTS -i $target_path/$file -f wav $tiny_psnr $pcm_dst $pcm_ref 2 8192 fi |