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/lavfi-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/lavfi-regression.sh')
| -rwxr-xr-x | tests/lavfi-regression.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/lavfi-regression.sh b/tests/lavfi-regression.sh index 7a5f239675..129358090e 100755 --- a/tests/lavfi-regression.sh +++ b/tests/lavfi-regression.sh @@ -19,8 +19,8 @@ do_video_filter() { filters=$2 shift 2 printf '%-20s' $label >>$logfile - run_ffmpeg -f image2 -vcodec pgmyuv -i $raw_src \ - -vf "$filters" -vcodec rawvideo $* -f nut md5: >>$logfile + run_ffmpeg $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src \ + $ENC_OPTS -vf "$filters" -vcodec rawvideo $* -f nut md5: >>$logfile } do_lavfi() { |