Merge commit '37e69e2dee7c5167083bb42d669f73f038111a79' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 25 Sep 2013 21:35:30 +0000 (23:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 25 Sep 2013 21:35:30 +0000 (23:35 +0200)
* commit '37e69e2dee7c5167083bb42d669f73f038111a79':
  ac3: Clean up the error paths
  ac3: Do not clash with normal AVERROR
  dxa: Make sure the reference frame exists
  h261: check the mtype index
  segafilm: Error out on impossible packet size
  ogg: Always alloc the private context in vorbis_header
  vc1: check mb_height validity.

Conflicts:
libavcodec/h261dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/aac_ac3_parser.h
libavcodec/ac3dec.c
libavcodec/dxa.c
libavcodec/h261dec.c
libavcodec/vc1dec.c
libavformat/segafilm.c

Simple merge
Simple merge
Simple merge
@@@ -286,8 -286,9 +286,9 @@@ static int h261_decode_mb(H261Context *
  
      // Read mtype
      h->mtype = get_vlc2(&s->gb, h261_mtype_vlc.table, H261_MTYPE_VLC_BITS, 2);
 -    if (h->mtype < 0 || h->mtype >= FF_ARRAY_ELEMS(h261_mtype_map)) {
 +    if (h->mtype < 0) {
-         av_log(s->avctx, AV_LOG_ERROR, "illegal mtype %d\n", h->mtype);
+         av_log(s->avctx, AV_LOG_ERROR, "Invalid mtype index %d\n",
+                h->mtype);
          return SLICE_ERROR;
      }
      h->mtype = h261_mtype_map[h->mtype];
Simple merge
Simple merge