diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-11 15:41:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-11 15:46:48 +0200 |
| commit | 526cb36e4b23d2aae14bba0d19947137ee94f263 (patch) | |
| tree | 5929c96c8c1bc7b58cfd665d78806d7208fa00da /tests | |
| parent | a75dd13b1bc2132f58bb438e6ca2935677191885 (diff) | |
| parent | 4436f25a1682ada3f7226cb6fadf429946933161 (diff) | |
| download | ffmpeg-526cb36e4b23d2aae14bba0d19947137ee94f263.tar.gz | |
Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'
* commit '4436f25a1682ada3f7226cb6fadf429946933161':
build: remove references to unused EXTRAOBJS variable
lavfi: convert input/ouput list compound literals to named objects
fate: add h263 obmc vsynth tests
avconv: remove bogus warning when using avconv -h without parameter
averror: explicitly define AVERROR_* values
flashsv: propagate inflateReset() errors
indeo4/5: remove constant parameter num_bands from wavelet recomposition
mxfdec: return error if no segments are available in mxf_get_sorted_table_segments
Double motion vector range for HPEL interlaced picture in proper place
Conflicts:
libavcodec/v210dec.h
libavfilter/af_aformat.c
libavfilter/af_amix.c
libavfilter/af_asyncts.c
libavfilter/af_channelmap.c
libavfilter/af_join.c
libavfilter/asrc_anullsrc.c
libavfilter/buffersrc.c
libavfilter/f_setpts.c
libavfilter/f_settb.c
libavfilter/fifo.c
libavfilter/src_movie.c
libavfilter/vf_ass.c
libavfilter/vf_blackframe.c
libavfilter/vf_boxblur.c
libavfilter/vf_delogo.c
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_fieldorder.c
libavfilter/vf_fps.c
libavfilter/vf_hflip.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
libavfilter/vf_select.c
libavfilter/vf_transpose.c
libavfilter/vf_yadif.c
libavfilter/vsrc_testsrc.c
libavformat/mxfdec.c
libavutil/error.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/vcodec.mak | 3 | ||||
| -rw-r--r-- | tests/ref/fate/vsynth1-h263-obmc | 4 | ||||
| -rw-r--r-- | tests/ref/fate/vsynth2-h263-obmc | 4 |
3 files changed, 11 insertions, 0 deletions
diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index f4e39b8ce7..e895499c62 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -79,6 +79,9 @@ fate-vsynth%-h261: ENCOPTS = -qscale 11 FATE_VCODEC += h263 fate-vsynth%-h263: ENCOPTS = -qscale 10 +FATE_VCODEC += h263-obmc +fate-vsynth%-h263-obmc: ENCOPTS = -qscale 10 -obmc 1 + FATE_VCODEC += h263p fate-vsynth%-h263p: ENCOPTS = -qscale 2 -flags +aic -umv 1 -aiv 1 -ps 300 diff --git a/tests/ref/fate/vsynth1-h263-obmc b/tests/ref/fate/vsynth1-h263-obmc new file mode 100644 index 0000000000..d82c425f5a --- /dev/null +++ b/tests/ref/fate/vsynth1-h263-obmc @@ -0,0 +1,4 @@ +bdd8f9cafa39df97f2e395110f4419e0 *tests/data/fate/vsynth1-h263-obmc.avi +657328 tests/data/fate/vsynth1-h263-obmc.avi +844f7ee27fa122e199fe20987b41a15c *tests/data/fate/vsynth1-h263-obmc.out.rawvideo +stddev: 8.16 PSNR: 29.89 MAXDIFF: 113 bytes: 7603200/ 7603200 diff --git a/tests/ref/fate/vsynth2-h263-obmc b/tests/ref/fate/vsynth2-h263-obmc new file mode 100644 index 0000000000..d8a65db4dc --- /dev/null +++ b/tests/ref/fate/vsynth2-h263-obmc @@ -0,0 +1,4 @@ +482d48074d94ed72b0c7057b9c129b45 *tests/data/fate/vsynth2-h263-obmc.avi +154738 tests/data/fate/vsynth2-h263-obmc.avi +588d992d9d8096da8bdc5027268da914 *tests/data/fate/vsynth2-h263-obmc.out.rawvideo +stddev: 5.39 PSNR: 33.49 MAXDIFF: 82 bytes: 7603200/ 7603200 |