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)
* 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>
1  2 
libavcodec/h264.c
libavcodec/mpegaudio_parser.c
libavcodec/vmdav.c
libavcodec/wmaprodec.c
libavformat/mp3dec.c
tests/ref/lavf-fate/mp3

Simple merge
Simple merge
@@@ -624,7 -631,7 +624,7 @@@ static int vmdaudio_decode_frame(AVCode
      /* decode audio chunks */
      if (audio_chunks > 0) {
          buf_end = buf + buf_size;
-         while ( buf_end - buf >= s->chunk_size) {
 -        while (buf + s->chunk_size <= buf_end) {
++        while (buf_end - buf >= s->chunk_size) {
              if (s->out_bps == 2) {
                  decode_audio_s16(output_samples_s16, buf, s->chunk_size,
                                   avctx->channels);
Simple merge
Simple merge
index 91e2b48,0000000..361314b
mode 100644,000000..100644
--- /dev/null
@@@ -1,3 -1,0 +1,3 @@@
- 40a4e41ae74ec8dacdf02402831a6a58 *./tests/data/lavf-fate/lavf.mp3
- 97230 ./tests/data/lavf-fate/lavf.mp3
++7fcf80c2059b5c058a6cdd2e2f798b6c *./tests/data/lavf-fate/lavf.mp3
++96366 ./tests/data/lavf-fate/lavf.mp3
 +./tests/data/lavf-fate/lavf.mp3 CRC=0x6c9850fe