diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-05-26 12:47:47 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-05-29 19:19:16 +0200 |
| commit | 8daf21d5675cd039af4617a89f98c926d3bb486b (patch) | |
| tree | c4435c5534401a017b5b3e0c9352284d63385c29 /tests | |
| parent | a977d91e28cfe907fe55b9e48cc97d837946f174 (diff) | |
| download | ffmpeg-8daf21d5675cd039af4617a89f98c926d3bb486b.tar.gz | |
avconv: merge configuration code for complex and simple filters
Some tests change because -s now inserts the scaler to the end instead
of beginning of the filtergraph.
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/lavf-regression.sh | 2 | ||||
| -rw-r--r-- | tests/ref/fate/idroq-video-encode | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh index 1d4e26252c..a1983063d3 100755 --- a/tests/lavf-regression.sh +++ b/tests/lavf-regression.sh @@ -67,7 +67,7 @@ do_lavf mxf "-ar 48000" "-bf 2 -timecode_frame_start 264363" 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 859d3b8118..badb06d11d 100644 --- a/tests/ref/fate/idroq-video-encode +++ b/tests/ref/fate/idroq-video-encode @@ -1 +1 @@ -5090bb74bad2ea17093c32682b608dc4 +2ac89fa0e5600152667bcbc661f06cfe |