[FFmpeg-cvslog] Merge commit '747fbe0c212b81952bb27ec7b99fa709081e2d63' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 14 02:34:01 2013 +0100| [6086a4d74d09e2df57f9b84006c877b829707d40] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6086a4d74d09e2df57f9b84006c877b829707d40
---