diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-09 13:40:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-09 13:58:55 +0200 |
| commit | 60ef0c6f909703ae4dc021f6857d254c7badc1ec (patch) | |
| tree | f03160a80bdb19f4448dcd31fdfc4a8e2aa22d89 /tests/lavf-regression.sh | |
| parent | c740e083bc46f5380367627852a262f049a5e717 (diff) | |
| parent | 60fd7d36c47d62d4c603bf16c213b1a924f5cfcf (diff) | |
| download | ffmpeg-60ef0c6f909703ae4dc021f6857d254c7badc1ec.tar.gz | |
Merge commit '60fd7d36c47d62d4c603bf16c213b1a924f5cfcf'
* commit '60fd7d36c47d62d4c603bf16c213b1a924f5cfcf':
fate: correctly set sample rate for mp2 tests
Conflicts:
tests/fate/acodec.mak
tests/lavf-regression.sh
one hunk has been ommited as it breaks fate
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/lavf-regression.sh')
| -rwxr-xr-x | tests/lavf-regression.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh index 897dc633a0..0efbc9c85a 100755 --- a/tests/lavf-regression.sh +++ b/tests/lavf-regression.sh @@ -64,11 +64,11 @@ do_audio_only() } if [ -n "$do_avi" ] ; then -do_lavf avi "" "-acodec mp2 -ab 64k" +do_lavf avi "" "-acodec mp2 -ar 44100 -ab 64k" fi if [ -n "$do_asf" ] ; then -do_lavf asf "" "-acodec mp2 -ab 64k" "-r 25" +do_lavf asf "" "-acodec mp2 -ar 44100 -ab 64k" "-r 25" fi if [ -n "$do_rm" ] ; then @@ -79,7 +79,7 @@ do_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $DEC_OPTS -ar 441 fi if [ -n "$do_mpg" ] ; then -do_lavf_timecode mpg "-ab 64k" +do_lavf_timecode mpg "-ab 64k -ar 44100" fi if [ -n "$do_mxf" ] ; then @@ -91,7 +91,7 @@ do_lavf mxf_d10 "-ar 48000 -ac 2" "-r 25 -vf scale=720:576,pad=720:608:0:32 -vco fi if [ -n "$do_ts" ] ; then -do_lavf ts "" "-ab 64k -mpegts_transport_stream_id 42" +do_lavf ts "" "-ab 64k -mpegts_transport_stream_id 42 -ar 44100" fi if [ -n "$do_swf" ] ; then @@ -99,7 +99,7 @@ do_lavf swf "" "-an" fi if [ -n "$do_ffm" ] ; then -do_lavf ffm +do_lavf ffm "" "-ar 44100" fi if [ -n "$do_flm" ] ; then @@ -133,13 +133,13 @@ do_lavf gxf "-ar 48000" "-r 25 -s pal -ac 1" fi if [ -n "$do_nut" ] ; then -do_lavf nut "" "-acodec mp2 -ab 64k" +do_lavf nut "" "-acodec mp2 -ab 64k -ar 44100" fi if [ -n "$do_mkv" ] ; then do_lavf mkv "" "-acodec mp2 -ab 64k -vcodec mpeg4 \ -attach ${raw_src%/*}/00.pgm -metadata:s:t mimetype=image/x-portable-greymap" -do_lavf mkv "" "-acodec mp2 -ab 64k -vcodec mpeg4" +do_lavf mkv "" "-acodec mp2 -ab 64k -vcodec mpeg4 -ar 44100" fi if [ -n "$do_mp3" ] ; then |