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/lavfi-regression.sh | |
parent | 86824c1dcb3eaffc2b143de452e8082dc3c59822 (diff) | |
parent | 67e7dc54049d9b51a0c2168c8265145a9aef7780 (diff) |
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/lavfi-regression.sh')
-rwxr-xr-x | tests/lavfi-regression.sh | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/lavfi-regression.sh b/tests/lavfi-regression.sh index 0322134163..a5a06e1d00 100755 --- a/tests/lavfi-regression.sh +++ b/tests/lavfi-regression.sh @@ -11,15 +11,13 @@ set -e eval do_$test=y -rm -f "$logfile" - do_video_filter() { label=$1 filters=$2 shift 2 - printf '%-20s' $label >>$logfile + printf '%-20s' $label run_ffmpeg $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src \ - $ENC_OPTS -vf "$filters" -vcodec rawvideo $* -f nut md5: >>$logfile + $ENC_OPTS -vf "$filters" -vcodec rawvideo $* -f nut md5: } do_lavfi() { |