diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-17 04:01:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-17 04:03:50 +0200 |
| commit | 4778783160fb8d7aa39dafdabc756f1691b830f7 (patch) | |
| tree | 4b79ab7e0bcefb304b8a4f3c32908d3217d6b4a9 /tests/codec-regression.sh | |
| parent | dcd207c4cbcd9dd72b73e5b544c055b29885be64 (diff) | |
| parent | 3b266da3d35f3f7a61258b78384dfe920d875d29 (diff) | |
Merge commit '3b266da3d35f3f7a61258b78384dfe920d875d29'
* commit '3b266da3d35f3f7a61258b78384dfe920d875d29':
avconv: add support for complex filtergraphs.
avconv: make filtergraphs global.
avconv: move filtered_frame from InputStream to OutputStream.
avconv: don't set output width/height directly from input value.
avconv: move resample_{width,height,pix_fmt} to InputStream.
avconv: remove a useless variable from OutputStream.
avconv: get output pixel format from lavfi.
graphparser: fix the order in which unlabeled input links are returned.
avconv: change {input,output}_{streams,files} into arrays of pointers.
avconv: don't pass input/output streams to some functions.
Conflicts:
cmdutils.c
cmdutils.h
doc/ffmpeg.texi
ffmpeg.c
ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/codec-regression.sh')
| -rwxr-xr-x | tests/codec-regression.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh index a8671699a5..1e5f8166bd 100755 --- a/tests/codec-regression.sh +++ b/tests/codec-regression.sh @@ -73,9 +73,9 @@ do_video_encoding mpeg2threadivlc.mpg "-qscale 10 -vcodec mpeg2video -f mpeg1vid do_video_decoding # mpeg2 encoding interlaced -file=${outfile}mpeg2reuse.mpg -do_avconv $file $DEC_OPTS -me_threshold 256 -i ${target_path}/${outfile}mpeg2thread.mpg $ENC_OPTS -same_quant -me_threshold 256 -mb_threshold 1024 -vcodec mpeg2video -f mpeg1video -bf 2 -flags +ildct+ilme -threads 4 -do_video_decoding +#file=${outfile}mpeg2reuse.mpg +#do_avconv $file $DEC_OPTS -me_threshold 256 -i ${target_path}/${outfile}mpeg2thread.mpg $ENC_OPTS -same_quant -me_threshold 256 -mb_threshold 1024 -vcodec mpeg2video -f mpeg1video -bf 2 -flags +ildct+ilme -threads 4 +#do_video_decoding fi if [ -n "$do_msmpeg4v2" ] ; then |