• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 964912ab
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    964912ab
cljr 239 Bytes