Merge commit '798c715f4fa5cde37456af6202a32ee62cfb96d9' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 7 Mar 2014 02:54:51 +0000 (03:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 7 Mar 2014 02:54:51 +0000 (03:54 +0100)
* commit '798c715f4fa5cde37456af6202a32ee62cfb96d9':
  configure: enable PIC on s390(x)
  ituh263: reject b-frame with pp_time = 0
  lagarith: reallocate rgb_planes when needed
  truemotion1: check the header size
  shorten: pad the internal bitstream buffer
  samplefmt: avoid integer overflow in av_samples_get_buffer_size()

Conflicts:
libavcodec/lagarith.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
libavcodec/ituh263dec.c
libavcodec/lagarith.c
libavcodec/shorten.c
libavcodec/truemotion1.c
libavutil/samplefmt.c

diff --cc configure
Simple merge
Simple merge
Simple merge
@@@ -435,9 -439,9 +435,9 @@@ static int shorten_decode_frame(AVCodec
      /* allocate internal bitstream buffer */
      if (s->max_framesize == 0) {
          void *tmp_ptr;
 -        s->max_framesize = 1024; // should hopefully be enough for the first header
 +        s->max_framesize = 8192; // should hopefully be enough for the first header
          tmp_ptr = av_fast_realloc(s->bitstream, &s->allocated_bitstream_size,
-                                   s->max_framesize);
+                                   s->max_framesize + FF_INPUT_BUFFER_PADDING_SIZE);
          if (!tmp_ptr) {
              av_log(avctx, AV_LOG_ERROR, "error allocating bitstream buffer\n");
              return AVERROR(ENOMEM);
Simple merge
Simple merge