diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-04 12:06:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-04 12:07:06 +0200 |
| commit | 233ab0f02a316e3f7d515089d5d5dbc4a895ac11 (patch) | |
| tree | 6874651ee5743be3187c9cf5a9275c517083aa41 /libavformat/4xm.c | |
| parent | 642207d29a4861900cf34f19e8c7ded23ace6075 (diff) | |
| parent | 5bcd3ae5b167fb74215520b01d5d810e0c8986ab (diff) | |
| download | ffmpeg-streaming-233ab0f02a316e3f7d515089d5d5dbc4a895ac11.zip ffmpeg-streaming-233ab0f02a316e3f7d515089d5d5dbc4a895ac11.tar.gz | |
Merge commit '5bcd3ae5b167fb74215520b01d5d810e0c8986ab'
* commit '5bcd3ae5b167fb74215520b01d5d810e0c8986ab':
matroskadec: Check that .lang was allocated and set before reading it
Conflicts:
libavformat/matroskadec.c
See: 01fd1aa0ad2b95045df35f94ee9de073d24609c8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/4xm.c')
0 files changed, 0 insertions, 0 deletions
