diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-06-15 08:00:03 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-06-15 21:57:52 +0200 |
| commit | d7ee44024c96ebdbcd718885a77e9a07779df54c (patch) | |
| tree | acef5df8b963857d97380d51fe5dfb7bca094abd /tests/lavf-regression.sh | |
| parent | 88ff180ad66d5b12f5ee0ffbda891b467725a8d3 (diff) | |
ffmpeg: don't abuse a global for passing samplerate from input to output
It's broken with multiple files or audio streams.
This removes the default samplerate of 44100 for raw input, hence all
the FATE changes.
Diffstat (limited to 'tests/lavf-regression.sh')
| -rwxr-xr-x | tests/lavf-regression.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh index 94d258334b..39e752b3c6 100755 --- a/tests/lavf-regression.sh +++ b/tests/lavf-regression.sh @@ -14,7 +14,7 @@ eval do_$test=y do_lavf() { file=${outfile}lavf.$1 - do_ffmpeg $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $DEC_OPTS -f s16le -i $pcm_src $ENC_OPTS -t 1 -qscale 10 $2 + do_ffmpeg $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $DEC_OPTS -ar 44100 -f s16le -i $pcm_src $ENC_OPTS -t 1 -qscale 10 $2 do_ffmpeg_crc $file $DEC_OPTS -i $target_path/$file $3 } @@ -39,8 +39,8 @@ do_image_formats() do_audio_only() { file=${outfile}lavf.$1 - do_ffmpeg $file $DEC_OPTS $2 -f s16le -i $pcm_src $ENC_OPTS -t 1 -qscale 10 $3 - do_ffmpeg_crc $file $DEC_OPTS -i $target_path/$file + do_ffmpeg $file $DEC_OPTS $2 -ar 44100 -f s16le -i $pcm_src $ENC_OPTS -t 1 -qscale 10 $3 + do_ffmpeg_crc $file $DEC_OPTS $4 -i $target_path/$file } rm -f "$logfile" @@ -55,7 +55,7 @@ fi if [ -n "$do_rm" ] ; then file=${outfile}lavf.rm -do_ffmpeg $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $DEC_OPTS -f s16le -i $pcm_src $ENC_OPTS -t 1 -qscale 10 -acodec ac3_fixed +do_ffmpeg $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $DEC_OPTS -ar 44100 -f s16le -i $pcm_src $ENC_OPTS -t 1 -qscale 10 -acodec ac3_fixed # broken #do_ffmpeg_crc $file -i $target_path/$file fi @@ -181,11 +181,11 @@ do_audio_only wav fi if [ -n "$do_alaw" ] ; then -do_audio_only al +do_audio_only al "" "" "-ar 44100" fi if [ -n "$do_mulaw" ] ; then -do_audio_only ul +do_audio_only ul "" "" "-ar 44100" fi if [ -n "$do_au" ] ; then |