diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-07 03:54:51 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-07 03:54:51 +0100 |
commit | 993c2a256dd9bda240883f629b468675644b706c (patch) | |
tree | 9ef42aa333dd18a52f09b71811845ab16fcbd6ba /MAINTAINERS | |
parent | c9fef27deb992066c27255e22bb906015858a098 (diff) | |
parent | 798c715f4fa5cde37456af6202a32ee62cfb96d9 (diff) | |
download | ffmpeg-993c2a256dd9bda240883f629b468675644b706c.tar.gz |
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>
Diffstat (limited to 'MAINTAINERS')
0 files changed, 0 insertions, 0 deletions