diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 17:51:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 17:51:21 +0100 |
| commit | 1825d6d096102c2a220d61bad34009f583ca4a5e (patch) | |
| tree | 6fb67810b42eb77e551e378c7c8f9dcc7c0d042c /libavdevice | |
| parent | a5115752cad0fdda77ce07ecb0cbc05988a7f7c7 (diff) | |
| parent | 12dc01bb1f07112cd7eb31e183d75cb3c0fb92ca (diff) | |
| download | ffmpeg-1825d6d096102c2a220d61bad34009f583ca4a5e.tar.gz | |
Merge commit '12dc01bb1f07112cd7eb31e183d75cb3c0fb92ca' into release/0.10
* commit '12dc01bb1f07112cd7eb31e183d75cb3c0fb92ca':
4xm: do not overread the prestream buffer
Conflicts:
libavcodec/4xm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice')
0 files changed, 0 insertions, 0 deletions