diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-30 03:32:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-30 04:38:32 +0200 |
| commit | 16e25ef34b375dbc6789b6b0da7d077c1dcefe88 (patch) | |
| tree | cd2b27d2a0c185192c1202f0aaa7979c760ed6a1 /tests | |
| parent | b0387edd5e766b1032f946d6cdb35b765bb45435 (diff) | |
| parent | c9cc76290f8139a012a12efe7e581276b8bd8dff (diff) | |
| download | ffmpeg-16e25ef34b375dbc6789b6b0da7d077c1dcefe88.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: extend -r to work on any input stream.
doc/avconv: expand documentation for the -s option.
avconv: don't print filters inserted by avconv in stream mappings.
avconv: merge configuration code for complex and simple filters
avconv: split configuring input filters out of configure_complex_filter
Conflicts:
configure
doc/ffmpeg.texi
ffmpeg.c
tests/ref/fate/idroq-video-encode
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/mapchan.mak | 6 | ||||
| -rwxr-xr-x | tests/lavf-regression.sh | 2 | ||||
| -rw-r--r-- | tests/ref/fate/idroq-video-encode | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/fate/mapchan.mak b/tests/fate/mapchan.mak index 119f56613e..2a05f01e67 100644 --- a/tests/fate/mapchan.mak +++ b/tests/fate/mapchan.mak @@ -2,9 +2,9 @@ FATE_MAPCHAN += fate-mapchan-6ch-extract-2 fate-mapchan-6ch-extract-2: tests/data/asynth-22050-6.wav fate-mapchan-6ch-extract-2: CMD = ffmpeg -i $(TARGET_PATH)/tests/data/asynth-22050-6.wav -map_channel 0.0.0 -f wav md5: -map_channel 0.0.1 -f wav md5: -FATE_MAPCHAN += fate-mapchan-6ch-extract-2-downmix-mono -fate-mapchan-6ch-extract-2-downmix-mono: tests/data/asynth-22050-6.wav -fate-mapchan-6ch-extract-2-downmix-mono: CMD = md5 -i $(TARGET_PATH)/tests/data/asynth-22050-6.wav -map_channel 0.0.1 -map_channel 0.0.0 -ac 1 -f wav +#FATE_MAPCHAN += fate-mapchan-6ch-extract-2-downmix-mono +#fate-mapchan-6ch-extract-2-downmix-mono: tests/data/asynth-22050-6.wav +#fate-mapchan-6ch-extract-2-downmix-mono: CMD = md5 -i $(TARGET_PATH)/tests/data/asynth-22050-6.wav -map_channel 0.0.1 -map_channel 0.0.0 -ac 1 -f wav FATE_MAPCHAN += fate-mapchan-silent-mono fate-mapchan-silent-mono: tests/data/asynth-22050-1.wav diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh index 7c83dae5c3..4d908aaacf 100755 --- a/tests/lavf-regression.sh +++ b/tests/lavf-regression.sh @@ -87,7 +87,7 @@ do_lavf_timecode mxf "-ar 48000 -bf 2" fi if [ -n "$do_mxf_d10" ]; then -do_lavf mxf_d10 "-ar 48000 -ac 2" "-r 25 -s 720x576 -vf pad=720:608:0:32 -vcodec mpeg2video -g 0 -flags +ildct+low_delay -dc 10 -non_linear_quant 1 -intra_vlc 1 -qscale 1 -ps 1 -qmin 1 -rc_max_vbv_use 1 -rc_min_vbv_use 1 -pix_fmt yuv422p -minrate 30000k -maxrate 30000k -b 30000k -bufsize 1200000 -top 1 -rc_init_occupancy 1200000 -qmax 12 -f mxf_d10" +do_lavf mxf_d10 "-ar 48000 -ac 2" "-r 25 -vf scale=720:576,pad=720:608:0:32 -vcodec mpeg2video -g 0 -flags +ildct+low_delay -dc 10 -non_linear_quant 1 -intra_vlc 1 -qscale 1 -ps 1 -qmin 1 -rc_max_vbv_use 1 -rc_min_vbv_use 1 -pix_fmt yuv422p -minrate 30000k -maxrate 30000k -b 30000k -bufsize 1200000 -top 1 -rc_init_occupancy 1200000 -qmax 12 -f mxf_d10" fi if [ -n "$do_ts" ] ; then diff --git a/tests/ref/fate/idroq-video-encode b/tests/ref/fate/idroq-video-encode index 4c89de8b63..bfffb090c2 100644 --- a/tests/ref/fate/idroq-video-encode +++ b/tests/ref/fate/idroq-video-encode @@ -1 +1 @@ -75df9ce475c1b185fc3dbc219596edd3 +736168b00f6b79f472a57bf47b587c8c |