Merge commit 'aade60ab165716523788cd11caf03ae61b40144a' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 7 Sep 2013 11:49:23 +0000 (13:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 7 Sep 2013 11:49:23 +0000 (13:49 +0200)
* commit 'aade60ab165716523788cd11caf03ae61b40144a':
  matroskadec: Check that .lang was allocated and set before reading it
  alac: Limit max_samples_per_frame
  ape demuxer: check for EOF in potentially long loops
  4xm: check that bits per sample is strictly positive
  lavf: avoid integer overflow when estimating bitrate
  pictordec: pass correct context to avpriv_request_sample

Conflicts:
libavcodec/pictordec.c
libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/alac.c
libavformat/4xm.c
libavformat/ape.c
libavformat/matroskadec.c
libavformat/utils.c

Simple merge
Simple merge
@@@ -274,11 -276,10 +274,13 @@@ static int ape_read_header(AVFormatCont
          ape->seektable = av_malloc(ape->seektablelength);
          if (!ape->seektable)
              return AVERROR(ENOMEM);
-         for (i = 0; i < ape->seektablelength / sizeof(uint32_t); i++)
+         for (i = 0;
+              i < ape->seektablelength / sizeof(uint32_t) && !pb->eof_reached;
+              i++)
              ape->seektable[i] = avio_rl32(pb);
 +    }else{
 +        av_log(s, AV_LOG_ERROR, "Missing seektable\n");
 +        return AVERROR_INVALIDDATA;
      }
  
      ape->frames[0].pos     = ape->firstframe;
Simple merge
Simple merge