Merge commit 'd785f6940144eb6ce4c24309ed034056b81395bc' into release/0.8
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Sep 2013 15:22:35 +0000 (17:22 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Sep 2013 15:22:53 +0000 (17:22 +0200)
commit0a41da3e9d2090c562b752d086bcbd4dee69c796
treeb020af05513ba8d508a7d2d095b1ef904da93454
parentafe09e490a30c97aad6736f99d186634c354eb34
parentd785f6940144eb6ce4c24309ed034056b81395bc
Merge commit 'd785f6940144eb6ce4c24309ed034056b81395bc' into release/0.8

* commit 'd785f6940144eb6ce4c24309ed034056b81395bc':
  shorten: validate that the channel count in the header is not <= 0
  matroskadec: request a read buffer for the wav header
  h264: check for luma and chroma bit depth being equal
  xxan: fix invalid memory access in xan_decode_frame_type0()
  wmadec: require block_align to be set.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c
libavcodec/shorten.c
libavcodec/wmadec.c
libavcodec/xxan.c
libavformat/matroskadec.c