diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-07 14:27:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-07 14:29:09 +0200 |
| commit | de5e00336988ccff74715bcad0c7697ea8c57baf (patch) | |
| tree | c809ec6c8856dfe667f9d264d12c14904a1b481b /libavformat/seek.h | |
| parent | 5c6aea5c31bf2a2f3343a051f6b39a62b245878e (diff) | |
| parent | b01e4d80c69da83d765263dd774fbbc4a2944b97 (diff) | |
| download | ffmpeg-de5e00336988ccff74715bcad0c7697ea8c57baf.tar.gz | |
Merge remote-tracking branch 'qatar/release/9' into release/1.1
* qatar/release/9:
mpegvideo: Avoid 32-bit wrapping of linesize multiplications
mjpegb: Detect changing number of planes in interlaced video
alac: Check that the channels fit at the given offset
4xm: Check that the read track value is non-negative
Conflicts:
libavcodec/alac.c
libavcodec/mjpegdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/seek.h')
0 files changed, 0 insertions, 0 deletions