ffmpeg/tests/ref/vsynth2
Michael Niedermayer 964912aba5 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>
2011-12-11 01:05:33 +01:00
..
amv
asv1
asv2
cljr Merge remote-tracking branch 'qatar/master' 2011-12-11 01:05:33 +01:00
dnxhd_720p
dnxhd_720p_10bit
dnxhd_720p_rd
dnxhd_1080i movenc: Always write EDTS when we are able to. 2011-12-07 05:21:37 +01:00
dv Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
dv50
dv_411 Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
error
ffv1
flashsv
flashsv2
flv
h261
h263
h263p
huffyuv
jpeg2000
jpegls
ljpeg
mjpeg
mpeg
mpeg1b
mpeg2
mpeg2_422
mpeg2_idct_int
mpeg2_ilace
mpeg2_ivlc_qprd
mpeg2thread Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
mpeg2thread_ilace Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
mpeg4 movenc: Always write EDTS when we are able to. 2011-12-07 05:21:37 +01:00
mpeg4_adap
mpeg4_qpel
mpeg4_qprd
mpeg4adv
mpeg4nr
mpeg4thread
mpng Add tests for several encoders. 2011-12-05 20:05:44 +01:00
msmpeg4
msmpeg4v2
msvideo1
prores movenc: Always write EDTS when we are able to. 2011-12-07 05:21:37 +01:00
qtrle movenc: Always write EDTS when we are able to. 2011-12-07 05:21:37 +01:00
qtrlegray movenc: Always write EDTS when we are able to. 2011-12-07 05:21:37 +01:00
rc
rgb
roq
rv10
rv20
snow
snowll
svq1 movenc: Always write EDTS when we are able to. 2011-12-07 05:21:37 +01:00
v210 Add tests for several encoders. 2011-12-05 20:05:44 +01:00
vref
wmv1
wmv2
yuv
zlib Add tests for several encoders. 2011-12-05 20:05:44 +01:00
zmbv Run zmbv regression without md5sum. 2011-12-10 19:34:28 +01:00