Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 10 Sep 2011 18:52:48 +0000 (20:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 10 Sep 2011 18:52:48 +0000 (20:52 +0200)
commit7db7eb08e051d0d95215f645e0cfa9a5879cded0
tree62fb724f4bc8fd03e521ef797d42e61708310f14
parent60599c68b04ec9d8b09750dd3f45f6ce92e61d35
parent8bfea4ab4e2cb32bc7bf6f697ee30a238c65d296
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Fixed segfault with wavpack decoder on corrupted decorrelation terms sub-blocks.
  avconv: move audio_channels to the options context.
  avconv: move *_disable to options context.
  avconv: remove -[vas]lang options.
  avconv: move codec tags to options context.
  cljr: init_get_bits size in bits instead of bytes
  indeo2: fail if input buffer too small
  indeo2: init_get_bits size in bits instead of bytes
  ffv1: Fixed size given to init_get_bits() in decoder.

Conflicts:
avconv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
avconv.c
doc/avconv.texi
ffmpeg.c
libavcodec/cljr.c
libavcodec/indeo2.c
libavcodec/wavpack.c