diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-04-09 02:02:29 +0200 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-04-09 02:11:25 +0200 |
| commit | 60fd7d36c47d62d4c603bf16c213b1a924f5cfcf (patch) | |
| tree | eecc8dbdaad6e4d0cb614440752e91174e87332b | |
| parent | e6e8be542b8e9f6c200b55dd1b444ec517dc85da (diff) | |
| download | ffmpeg-60fd7d36c47d62d4c603bf16c213b1a924f5cfcf.tar.gz | |
fate: correctly set sample rate for mp2 tests
| -rw-r--r-- | tests/fate/acodec.mak | 2 | ||||
| -rwxr-xr-x | tests/lavf-regression.sh | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tests/fate/acodec.mak b/tests/fate/acodec.mak index 0eb6227518..3431754bfe 100644 --- a/tests/fate/acodec.mak +++ b/tests/fate/acodec.mak @@ -1,6 +1,6 @@ fate-acodec-%: CODEC = $(@:fate-acodec-%=%) fate-acodec-%: SRC = tests/data/asynth-44100-2.wav -fate-acodec-%: CMD = enc_dec wav $(SRC) $(FMT) "-b 128k -c $(CODEC)" wav "-c pcm_s16le" -keep +fate-acodec-%: CMD = enc_dec wav $(SRC) $(FMT) "-b 128k -ar 44100 -c $(CODEC)" wav "-c pcm_s16le" -keep fate-acodec-%: CMP_UNIT = 2 fate-acodec-%: REF = $(SRC_PATH)/tests/ref/acodec/$(@:fate-acodec-%=%) diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh index 3083719cce..e2edee264b 100755 --- a/tests/lavf-regression.sh +++ b/tests/lavf-regression.sh @@ -44,11 +44,11 @@ do_audio_only() } if [ -n "$do_avi" ] ; then -do_lavf avi "" "-acodec mp2" +do_lavf avi "" "-acodec mp2 -ar 44100" fi if [ -n "$do_asf" ] ; then -do_lavf asf "" "-acodec mp2" "-r 25" +do_lavf asf "" "-acodec mp2 -ar 44100" "-r 25" fi if [ -n "$do_rm" ] ; then @@ -59,7 +59,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 mpg +do_lavf mpg "" "-ar 44100" fi if [ -n "$do_mxf" ] ; then @@ -71,7 +71,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 "" "-mpegts_transport_stream_id 42" +do_lavf ts "" "-mpegts_transport_stream_id 42 -ar 44100" fi if [ -n "$do_swf" ] ; then @@ -79,7 +79,7 @@ do_lavf swf "" "-an" fi if [ -n "$do_ffm" ] ; then -do_lavf ffm +do_lavf ffm "" "-ar 44100" fi if [ -n "$do_flv_fmt" ] ; then @@ -99,11 +99,11 @@ do_lavf gxf "-ar 48000" "-r 25 -s pal -ac 1" fi if [ -n "$do_nut" ] ; then -do_lavf nut "" "-acodec mp2" +do_lavf nut "" "-acodec mp2 -ar 44100" fi if [ -n "$do_mkv" ] ; then -do_lavf mkv "" "-c:a mp2 -c:v mpeg4" +do_lavf mkv "" "-c:a mp2 -c:v mpeg4 -ar 44100" fi |