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)
commit993c2a256dd9bda240883f629b468675644b706c
tree9ef42aa333dd18a52f09b71811845ab16fcbd6ba
parentc9fef27deb992066c27255e22bb906015858a098
parent798c715f4fa5cde37456af6202a32ee62cfb96d9
Merge commit '798c715f4fa5cde37456af6202a32ee62cfb96d9' into release/1.1

* 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>
configure
libavcodec/ituh263dec.c
libavcodec/lagarith.c
libavcodec/shorten.c
libavcodec/truemotion1.c
libavutil/samplefmt.c