diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-13 11:56:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-13 11:56:31 +0200 |
| commit | 4027e136635759999ffb5fa16d1053f26c1dec5e (patch) | |
| tree | 697896a1a82cd5ac499a505e8579e7fcb8e672bd /libavcodec/sp5xdec.c | |
| parent | 60657ee37afb5388b75430db95cbce5146731c63 (diff) | |
| parent | 42d73f7f6bea0ee0f64a3ad4882860ce5b923a11 (diff) | |
| download | ffmpeg-4027e136635759999ffb5fa16d1053f26c1dec5e.tar.gz | |
Merge commit '42d73f7f6bea0ee0f64a3ad4882860ce5b923a11'
* commit '42d73f7f6bea0ee0f64a3ad4882860ce5b923a11':
4xm: do not overread while parsing header
Conflicts:
libavformat/4xm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sp5xdec.c')
0 files changed, 0 insertions, 0 deletions