diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-07 13:49:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-07 13:49:23 +0200 |
| commit | dfe0ba46bf484b8b64cd7584353e97ea18912c13 (patch) | |
| tree | ac8cc77b066b6d6e484632101670e2a75af54a0f /libavcodec/realtextdec.c | |
| parent | 6bfa823b70ec135b59e036106eb403a546145faa (diff) | |
| parent | aade60ab165716523788cd11caf03ae61b40144a (diff) | |
| download | ffmpeg-dfe0ba46bf484b8b64cd7584353e97ea18912c13.tar.gz | |
Merge commit 'aade60ab165716523788cd11caf03ae61b40144a' into release/1.1
* commit 'aade60ab165716523788cd11caf03ae61b40144a':
matroskadec: Check that .lang was allocated and set before reading it
alac: Limit max_samples_per_frame
ape demuxer: check for EOF in potentially long loops
4xm: check that bits per sample is strictly positive
lavf: avoid integer overflow when estimating bitrate
pictordec: pass correct context to avpriv_request_sample
Conflicts:
libavcodec/pictordec.c
libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/realtextdec.c')
0 files changed, 0 insertions, 0 deletions