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/regression-funcs.sh | |
| parent | ad42126abcdee921fd7eaf0b8a83f18aa3dc1371 (diff) | |
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/regression-funcs.sh')
| -rwxr-xr-x | tests/regression-funcs.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/regression-funcs.sh b/tests/regression-funcs.sh index 60aa4d8d21..bba189092b 100755 --- a/tests/regression-funcs.sh +++ b/tests/regression-funcs.sh @@ -95,7 +95,7 @@ do_avconv_crc() do_video_decoding() { - do_avconv $raw_dst $DEC_OPTS $1 -i $target_path/$file -f rawvideo -vcodec rawvideo $ENC_OPTS -vsync 0 $2 + do_avconv $raw_dst $DEC_OPTS $1 -i $target_path/$file -f rawvideo $ENC_OPTS -vsync 0 $2 } do_video_encoding() @@ -112,5 +112,5 @@ do_audio_encoding() do_audio_decoding() { - do_avconv $pcm_dst $DEC_OPTS -i $target_path/$file -sample_fmt s16 -f wav -acodec pcm_s16le + do_avconv $pcm_dst $DEC_OPTS -i $target_path/$file -sample_fmt s16 -f wav } |