diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-23 13:20:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-23 13:20:42 +0200 |
| commit | 621845feccd15cb035d55089aa16e07514fab89e (patch) | |
| tree | e81277aefa8b0fc7fbc6e4d632b13cea9249a6be /libavdevice/bktr.c | |
| parent | 341dc590535121ccb939ca145d87241de9e8e0c3 (diff) | |
| parent | 91be1103fd1f79d381edf268c32f4166b6c3b6d8 (diff) | |
| download | ffmpeg-621845feccd15cb035d55089aa16e07514fab89e.tar.gz | |
Merge commit '91be1103fd1f79d381edf268c32f4166b6c3b6d8'
* commit '91be1103fd1f79d381edf268c32f4166b6c3b6d8':
wnv1: Make sure the input packet is large enough
Conflicts:
libavcodec/wnv1.c
See: f23a2418fb0ccc56fdae4dbf83a5994cc917c475
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/bktr.c')
0 files changed, 0 insertions, 0 deletions