diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-10 04:01:29 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-10 04:03:17 +0200 |
commit | b97b4b58a6e1ac595002b3e3f3469161771c6003 (patch) | |
tree | 8c2833931fb16084f95bf0adf8317e1fa28aca12 /tests/codec-regression.sh | |
parent | 67d441499a042edcfb0f8a120e6196d10b1d13db (diff) | |
parent | a88ef93b4abbea9f18c8750113dc9e99931f2f8a (diff) |
Merge remote branch 'qatar/master'
* qatar/master:
mpegaudiodec: group #includes more sanely
mpegaudio: remove #if 0 blocks
ffmpeg.c: reset avoptions after each input/output file.
ffmpeg.c: store per-output stream sws flags.
mpegaudio: remove CONFIG_MPEGAUDIO_HP option
mpegtsenc: Clear st->priv_data when freeing it
udp: Fix receiving RTP data over multicast
rtpproto: Remove an unused variable
regtest: fix wma tests
NOT pulled: mpegaudio: remove CONFIG_AUDIO_NONSHORT
regtest: separate flags for encoding and decoding
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/codec-regression.sh')
-rwxr-xr-x | tests/codec-regression.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh index 07be0aeeb6..95b99e351a 100755 --- a/tests/codec-regression.sh +++ b/tests/codec-regression.sh @@ -61,7 +61,7 @@ do_video_decoding # mpeg2 encoding interlaced file=${outfile}mpeg2reuse.mpg -do_ffmpeg $file -sameq -me_threshold 256 -mb_threshold 1024 -i ${target_path}/${outfile}mpeg2thread.mpg -vcodec mpeg2video -f mpeg1video -bf 2 -flags +ildct+ilme -threads 4 +do_ffmpeg $file $DEC_OPTS -me_threshold 256 -i ${target_path}/${outfile}mpeg2thread.mpg $ENC_OPTS -sameq -me_threshold 256 -mb_threshold 1024 -vcodec mpeg2video -f mpeg1video -bf 2 -flags +ildct+ilme -threads 4 do_video_decoding fi @@ -328,12 +328,12 @@ fi if [ -n "$do_wmav1" ] ; then do_audio_encoding wmav1.asf "-acodec wmav1" -do_ffmpeg_nomd5 $pcm_dst -i $target_path/$file -f wav +do_ffmpeg_nomd5 $pcm_dst $DEC_OPTS -i $target_path/$file -f wav $tiny_psnr $pcm_dst $pcm_ref 2 8192 >> $logfile fi if [ -n "$do_wmav2" ] ; then do_audio_encoding wmav2.asf "-acodec wmav2" -do_ffmpeg_nomd5 $pcm_dst -i $target_path/$file -f wav +do_ffmpeg_nomd5 $pcm_dst $DEC_OPTS -i $target_path/$file -f wav $tiny_psnr $pcm_dst $pcm_ref 2 8192 >> $logfile fi |