[FFmpeg-cvslog] Merge commit '798c715f4fa5cde37456af6202a32ee62cfb96d9' into release/1.1
Michael Niedermayer
git at videolan.org
Fri Mar 7 03:59:09 CET 2014
ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 7 03:54:51 2014 +0100| [993c2a256dd9bda240883f629b468675644b706c] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=993c2a256dd9bda240883f629b468675644b706c
---
More information about the ffmpeg-cvslog
mailing list