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>

1 files changed, 0 insertions, 2 deletions

diff --git a/libavcodec/cljr.c b/libavcodec/cljr.c
index ed0eede5bf..7ae3e7eeeb 100644
--- a/libavcodec/cljr.c
+++ b/libavcodec/cljr.c
@@ -31,7 +31,6 @@
 
 typedef struct CLJRContext {
     AVClass        *avclass;
-    AVCodecContext *avctx;
     AVFrame         picture;
     int             dither_type;
 } CLJRContext;
@@ -42,7 +41,6 @@ static av_cold int common_init(AVCodecContext *avctx)
 
     avcodec_get_frame_defaults(&a->picture);
     avctx->coded_frame = &a->picture;
-    a->avctx = avctx;
 
     return 0;
 }