diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-11 00:40:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-11 01:05:33 +0100 |
| commit | 964912aba56a29acf25c9e216255ea44190f419a (patch) | |
| tree | fa82f5555f1604d36380b186f1f89403d0b9c388 /tests/ref/fate | |
| parent | cdba9b617f1a77f035416096f3ea91158ec5307b (diff) | |
| parent | 2e87b4c51152e0241cae7f655d53920029a0e632 (diff) | |
| download | ffmpeg-964912aba56a29acf25c9e216255ea44190f419a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (21 commits)
Warn about avserver being broken.
avconv: drop code for special handling of avserver streams.
rawdec: don't set codec timebase.
lavf doxy: add muxing stuff to lavf_encoding group
lavf doxy: add demuxing stuff to lavf_decoding group
lavf doxy: expand/reword metadata API doxy.
lavf doxy: add installed headers to groups.
lavf doxy: add avio groups into the lavf_io group.
lavf doxy: rename lavf I/O group to lavf_io.
lavf doxy: add metadata docs to the main lavf group
ttadec: check channel count as read from extradata.
Add CLJR encoding and decoding regression tests
cljr: remove unused code
flacdec: Support for tracks in cuesheet metadata block
ptx: fix inverted check for sufficient data
flac muxer: fix writing of file header and STREAMINFO header from extradata
ptx: emit a warning on insufficient picture data
utvideo: add fate tests covering all codec variants
doc: update to refer to avconv
doc: remove some stale entries from the faq
...
Conflicts:
Changelog
avconv.c
doc/avconv.texi
doc/faq.texi
doc/ffplay.texi
doc/ffprobe.texi
doc/ffserver.texi
libavcodec/avcodec.h
libavcodec/cljr.c
libavformat/avformat.h
libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate')
| -rw-r--r-- | tests/ref/fate/utvideo_rgb_left | 4 | ||||
| -rw-r--r-- | tests/ref/fate/utvideo_rgb_median | 5 | ||||
| -rw-r--r-- | tests/ref/fate/utvideo_rgba_left | 5 | ||||
| -rw-r--r-- | tests/ref/fate/utvideo_rgba_median | 5 | ||||
| -rw-r--r-- | tests/ref/fate/utvideo_yuv420_left | 7 | ||||
| -rw-r--r-- | tests/ref/fate/utvideo_yuv420_median | 4 | ||||
| -rw-r--r-- | tests/ref/fate/utvideo_yuv422_left | 4 | ||||
| -rw-r--r-- | tests/ref/fate/utvideo_yuv422_median | 4 |
8 files changed, 38 insertions, 0 deletions
diff --git a/tests/ref/fate/utvideo_rgb_left b/tests/ref/fate/utvideo_rgb_left new file mode 100644 index 0000000000..5d2b73ca8a --- /dev/null +++ b/tests/ref/fate/utvideo_rgb_left @@ -0,0 +1,4 @@ +0, 0, 921600, 0x27e6001e +0, 3003, 921600, 0x7c0a92bc +0, 6006, 921600, 0x4d2be42c +0, 9009, 921600, 0x58ddd0be diff --git a/tests/ref/fate/utvideo_rgb_median b/tests/ref/fate/utvideo_rgb_median new file mode 100644 index 0000000000..69141537b9 --- /dev/null +++ b/tests/ref/fate/utvideo_rgb_median @@ -0,0 +1,5 @@ +0, 0, 921600, 0x9776611f +0, 3003, 921600, 0xdbfa64f4 +0, 6006, 921600, 0xed2a0580 +0, 9009, 921600, 0x6ecc80bc +0, 12012, 921600, 0x58ddd0be diff --git a/tests/ref/fate/utvideo_rgba_left b/tests/ref/fate/utvideo_rgba_left new file mode 100644 index 0000000000..7d3800e970 --- /dev/null +++ b/tests/ref/fate/utvideo_rgba_left @@ -0,0 +1,5 @@ +0, 0, 1228800, 0xf1bc9432 +0, 3003, 1228800, 0x8480d1e5 +0, 6006, 1228800, 0xb01d5fb2 +0, 9009, 1228800, 0x53cb42c4 +0, 12012, 1228800, 0x2b2ea176 diff --git a/tests/ref/fate/utvideo_rgba_median b/tests/ref/fate/utvideo_rgba_median new file mode 100644 index 0000000000..7d3800e970 --- /dev/null +++ b/tests/ref/fate/utvideo_rgba_median @@ -0,0 +1,5 @@ +0, 0, 1228800, 0xf1bc9432 +0, 3003, 1228800, 0x8480d1e5 +0, 6006, 1228800, 0xb01d5fb2 +0, 9009, 1228800, 0x53cb42c4 +0, 12012, 1228800, 0x2b2ea176 diff --git a/tests/ref/fate/utvideo_yuv420_left b/tests/ref/fate/utvideo_yuv420_left new file mode 100644 index 0000000000..bdb90a6168 --- /dev/null +++ b/tests/ref/fate/utvideo_yuv420_left @@ -0,0 +1,7 @@ +0, 0, 460800, 0xece98fc8 +0, 3003, 460800, 0x9baf786b +0, 6006, 460800, 0x8e8e0510 +0, 9009, 460800, 0x27c1f2ba +0, 12012, 460800, 0x6a817987 +0, 15015, 460800, 0x2f713ec2 +0, 18018, 460800, 0x003b560e diff --git a/tests/ref/fate/utvideo_yuv420_median b/tests/ref/fate/utvideo_yuv420_median new file mode 100644 index 0000000000..5cd3bc84ee --- /dev/null +++ b/tests/ref/fate/utvideo_yuv420_median @@ -0,0 +1,4 @@ +0, 0, 460800, 0x6a817987 +0, 3003, 460800, 0x2f713ec2 +0, 6006, 460800, 0x003b560e +0, 9009, 460800, 0x9e1bbf63 diff --git a/tests/ref/fate/utvideo_yuv422_left b/tests/ref/fate/utvideo_yuv422_left new file mode 100644 index 0000000000..d68bf4e26e --- /dev/null +++ b/tests/ref/fate/utvideo_yuv422_left @@ -0,0 +1,4 @@ +0, 0, 614400, 0x9a6b8802 +0, 3003, 614400, 0xaa8687e2 +0, 6006, 614400, 0x2fe5bd40 +0, 9009, 614400, 0x1c8f3737 diff --git a/tests/ref/fate/utvideo_yuv422_median b/tests/ref/fate/utvideo_yuv422_median new file mode 100644 index 0000000000..d68bf4e26e --- /dev/null +++ b/tests/ref/fate/utvideo_yuv422_median @@ -0,0 +1,4 @@ +0, 0, 614400, 0x9a6b8802 +0, 3003, 614400, 0xaa8687e2 +0, 6006, 614400, 0x2fe5bd40 +0, 9009, 614400, 0x1c8f3737 |