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>

10 files changed, 46 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
diff --git a/tests/ref/vsynth1/cljr b/tests/ref/vsynth1/cljr
new file mode 100644
index 0000000000..9a7a980b41
--- /dev/null
+++ b/tests/ref/vsynth1/cljr
@@ -0,0 +1,4 @@
+ff4eebcd5bd7b6470f97867cdecb0bec *./tests/data/vsynth1/cljr.avi
+ 5075660 ./tests/data/vsynth1/cljr.avi
+0d473eb49653a05685178dd261de861c *./tests/data/cljr.vsynth1.out.yuv
+stddev:   30.70 PSNR: 18.39 MAXDIFF:  255 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth2/cljr b/tests/ref/vsynth2/cljr
new file mode 100644
index 0000000000..cf3c8e1abf
--- /dev/null
+++ b/tests/ref/vsynth2/cljr
@@ -0,0 +1,4 @@
+8ca3f24da468f32561100d3a1a71348d *./tests/data/vsynth2/cljr.avi
+ 5075660 ./tests/data/vsynth2/cljr.avi
+a0126ba9f2b2192b6b63b485e0118114 *./tests/data/cljr.vsynth2.out.yuv
+stddev:   10.26 PSNR: 27.90 MAXDIFF:   62 bytes:  7603200/  7603200