Merge remote-tracking branch 'qatar/release/0.8' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 2 May 2012 20:49:14 +0000 (22:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 2 May 2012 22:20:54 +0000 (00:20 +0200)
commit15e9aee544f0ff2b556cff1fa87e4c348b861991
tree58078a2dfb33ae858a57d4aeac0964bfd4f847a5
parent265a628f162168f188f9756a06727a4ec41a183d
parente8050f313e7e3e1893155f878475872c4cc3a6e7
Merge remote-tracking branch 'qatar/release/0.8' into release/0.10

* qatar/release/0.8: (24 commits)
  apedec: check bits <= 32.
  truemotion: forbid invalid VLC bitsizes and token values.
  mov: don't overwrite existing indexes.
  truemotion2: handle out-of-frame motion vectors through edge extension.
  lzw: prevent buffer overreads.
  truemotion2: convert packet header reading to bytestream2.
  lagarith: fix buffer overreads.
  raw: forward avpicture_fill() error code in raw_decode().
  vc1: Do not read from array if index is invalid.
  utvideo: port header reading to bytestream2.
  bytestream: add more unchecked variants for bytestream2 API
  bytestream: K&R formatting cosmetics
  bytestream: Add bytestream2 writing API.
  aac: Reset PS parameters on header decode failure.
  mov: Do not read past the end of the ctts_data table.
  xwma: Validate channels and bits_per_coded_sample.
  asf: reset side data elements on packet copy.
  vqa: check palette chunk size before reading data.
  vqavideo: port to bytestream2 API
  wmavoice: fix stack overread.
  ...

Conflicts:
cmdutils.c
cmdutils.h
libavcodec/lagarith.c
libavcodec/truemotion2.c
libavcodec/vqavideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
21 files changed:
libavcodec/aacps.c
libavcodec/apedec.c
libavcodec/bytestream.h
libavcodec/lagarith.c
libavcodec/lagarithrac.c
libavcodec/lzw.c
libavcodec/mimic.c
libavcodec/mpegvideo.c
libavcodec/rawdec.c
libavcodec/truemotion2.c
libavcodec/utvideo.c
libavcodec/vc1.c
libavcodec/vc1data.c
libavcodec/vc1data.h
libavcodec/vc1dec.c
libavcodec/vqavideo.c
libavcodec/wmavoice.c
libavformat/asfdec.c
libavformat/mov.c
libavformat/xwma.c
tests/ref/fate/vqa-cc