diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-06-22 05:16:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-22 05:16:40 +0200 |
| commit | 043d2affbbc124c6d802fe2989d9b1ed73825368 (patch) | |
| tree | 5cf6ebba7a816fe0475cee59e9e946d726940607 /tests/codec-regression.sh | |
| parent | 86824c1dcb3eaffc2b143de452e8082dc3c59822 (diff) | |
| parent | 67e7dc54049d9b51a0c2168c8265145a9aef7780 (diff) | |
| download | ffmpeg-043d2affbbc124c6d802fe2989d9b1ed73825368.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rawdec: Fix decoding of QT WRAW files.
configure: report optimization for size separately
mov: Support Digital Voodoo SD 8 Bit and DTS codec identifiers.
mov: Support R10g codec identifier.
riff/img2: Add JPEG 2000 codec IDs.
riff: Add DAVC fourcc.
riff: Add M263, XVIX, MMJP, CDV5 fourccs.
rawvideo: Support auv2 fourcc.
swscale: Remove unused variable from ff_bfin_get_unscaled_swscale().
h264: Fix assert that failed to compile with -DDEBUG.
h264: Add x86 assembly for 10-bit weight/biweight H.264 functions.
fate: remove output redirections from old regtest scripts
Conflicts:
configure
libavcodec/rawdec.c
libavformat/isom.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/codec-regression.sh')
| -rwxr-xr-x | tests/codec-regression.sh | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh index b210231aea..981cc2f74c 100755 --- a/tests/codec-regression.sh +++ b/tests/codec-regression.sh @@ -11,8 +11,6 @@ set -e eval do_$test=y -rm -f "$logfile" - # generate reference for quality check if [ -n "$do_vref" ]; then do_ffmpeg $raw_ref -f image2 -vcodec pgmyuv -i $raw_src -an -f rawvideo @@ -280,14 +278,14 @@ fi if [ -n "$do_mp2" ] ; then do_audio_encoding mp2.mp2 do_audio_decoding -$tiny_psnr $pcm_dst $pcm_ref 2 1924 >> $logfile +$tiny_psnr $pcm_dst $pcm_ref 2 1924 fi if [ -n "$do_ac3_fixed" ] ; then do_audio_encoding ac3.rm "-vn -acodec ac3_fixed" # binaries configured with --disable-sse decode ac3 differently #do_audio_decoding -#$tiny_psnr $pcm_dst $pcm_ref 2 1024 >> $logfile +#$tiny_psnr $pcm_dst $pcm_ref 2 1024 fi if [ -n "$do_g726" ] ; then @@ -333,12 +331,12 @@ fi if [ -n "$do_wmav1" ] ; then do_audio_encoding wmav1.asf "-acodec wmav1" do_ffmpeg_nomd5 $pcm_dst $DEC_OPTS -i $target_path/$file -f wav -$tiny_psnr $pcm_dst $pcm_ref 2 8192 >> $logfile +$tiny_psnr $pcm_dst $pcm_ref 2 8192 fi if [ -n "$do_wmav2" ] ; then do_audio_encoding wmav2.asf "-acodec wmav2" do_ffmpeg_nomd5 $pcm_dst $DEC_OPTS -i $target_path/$file -f wav -$tiny_psnr $pcm_dst $pcm_ref 2 8192 >> $logfile +$tiny_psnr $pcm_dst $pcm_ref 2 8192 fi #if [ -n "$do_vorbis" ] ; then |