Merge commit 'ce3ce08850f1690dff01d9bb4ed6a4274d52771e' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Sep 2013 11:28:41 +0000 (13:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Sep 2013 11:28:52 +0000 (13:28 +0200)
commit506ad68d87f967640519a4d568c9236d53642a9a
tree9d1df3092861b041207bd859546dc8ceb1eef726
parentef475620b55a166b2131fd478391d4054f19ecd5
parentce3ce08850f1690dff01d9bb4ed6a4274d52771e
Merge commit 'ce3ce08850f1690dff01d9bb4ed6a4274d52771e' into release/0.10

* commit 'ce3ce08850f1690dff01d9bb4ed6a4274d52771e':
  dca: Error out on missing DSYNC
  pcm: always use codec->id instead of codec_id
  mlpdec: Do not set invalid context in read_restart_header
  pcx: Do not overread source buffer in pcx_rle_decode
  wmavoice: conceal clearly corrupted blocks
  iff: Do not read over the source buffer
  qdm2: Conceal broken samples

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dca.c
libavcodec/iff.c
libavcodec/mlpdec.c
libavcodec/pcm.c
libavcodec/pcx.c
libavcodec/qdm2.c
libavcodec/wmavoice.c