Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 9 Mar 2012 00:22:31 +0000 (01:22 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 9 Mar 2012 00:22:31 +0000 (01:22 +0100)
commita8cedbebf163ad376abc4703b3156c44d0858404
tree7198ad7a96b58d3ea53b2208601b707da2db3c00
parenta4524930d9299dbb8fafe165105d83bf7b6d3b89
parentea1d64ab1066145ba919b79a2080f3091d562217
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ttadec: unbreak playback of matroska files
  vorbisdec: avoid invalid memory access
  Fix uninitialized reads on malformed ogg files.
  huffyuv: add padding to classic (v1) huffman tables.
  png: convert to bytestream2 API.
  dca: include libavutil/mathematics.h for possibly missing M_SQRT1_2
  avs: fix infinite loop on end-of-stream.
  tiffdec: Prevent illegal memory access caused by recycled pointers.
  rtpenc: Fix the AVRational used for av_rescale_q_rnd
  wma: fix off-by-one in array bounds check.

Conflicts:
libavcodec/huffyuv.c
libavcodec/pngdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/cavsdec.c
libavcodec/dca.c
libavcodec/huffyuv.c
libavcodec/pngdec.c
libavcodec/tiff.c
libavcodec/tta.c
libavcodec/vorbisdec.c
libavformat/oggdec.c
libavformat/rtpenc.c