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/ref/vsynth1 | |
| 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/ref/vsynth1')
| -rw-r--r-- | tests/ref/vsynth1/mpeg2thread_ilace | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tests/ref/vsynth1/mpeg2thread_ilace b/tests/ref/vsynth1/mpeg2thread_ilace index f9c3339585..0667b68fae 100644 --- a/tests/ref/vsynth1/mpeg2thread_ilace +++ b/tests/ref/vsynth1/mpeg2thread_ilace @@ -2,7 +2,3 @@ 791773 ./tests/data/vsynth1/mpeg2threadivlc.mpg d1658911ca83f5616c1d32abc40750de *./tests/data/mpeg2thread_ilace.vsynth1.out.yuv stddev: 7.63 PSNR: 30.48 MAXDIFF: 110 bytes: 7603200/ 7603200 -d119fe917dd81d1ff758b4ce684a8d9d *./tests/data/vsynth1/mpeg2reuse.mpg -2074636 ./tests/data/vsynth1/mpeg2reuse.mpg -92ced6afe8c02304943c400cce51a5f4 *./tests/data/mpeg2thread_ilace.vsynth1.out.yuv -stddev: 7.66 PSNR: 30.44 MAXDIFF: 111 bytes: 7603200/ 7603200 |