diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-08 12:21:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-08 12:21:14 +0200 |
| commit | d0b27eab925cf5fb372840706a009b173418963f (patch) | |
| tree | 59ee75837a3a31532d682dd563852c62c1584413 /libavformat/mpegts.c | |
| parent | dc318505d010c600f58ab67224940b3dacf97bcd (diff) | |
| parent | 9c2216976907336dfae0e8e38a4d70ca2465a92c (diff) | |
| download | ffmpeg-d0b27eab925cf5fb372840706a009b173418963f.tar.gz | |
Merge commit '9c2216976907336dfae0e8e38a4d70ca2465a92c'
* commit '9c2216976907336dfae0e8e38a4d70ca2465a92c':
tiff: do not overread the source buffer
Conflicts:
libavcodec/tiff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpegts.c')
0 files changed, 0 insertions, 0 deletions