Merge commit '747fbe0c212b81952bb27ec7b99fa709081e2d63' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Mar 2013 01:34:01 +0000 (02:34 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Mar 2013 01:49:31 +0000 (02:49 +0100)
commit6086a4d74d09e2df57f9b84006c877b829707d40
tree7f9744b9bd8e66cc336b0b4990f25fdd0d6d87e2
parentd84c51904cad23ed76c38eec5080887dae7f5f27
parent747fbe0c212b81952bb27ec7b99fa709081e2d63
Merge commit '747fbe0c212b81952bb27ec7b99fa709081e2d63' into release/1.1

* commit '747fbe0c212b81952bb27ec7b99fa709081e2d63':
  roqvideodec: fix a potential infinite loop in roqvideo_decode_frame().
  mp3dec: Fix VBR bit rate parsing
  wmaprodec: return an error, not 0, when the input is too small.
  vmdaudio: fix invalid reads when packet size is not a multiple of chunk size
  h264: check for luma and chroma bit dept being equal
  Prepare for 9.4 Release

Conflicts:
RELEASE
libavcodec/vmdav.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c
libavcodec/mpegaudio_parser.c
libavcodec/vmdav.c
libavcodec/wmaprodec.c
libavformat/mp3dec.c
tests/ref/lavf-fate/mp3