diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-13 14:51:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-13 14:51:59 +0200 |
| commit | a9821bdafb3a8dc1f390b79c84f86fb94a46043b (patch) | |
| tree | db21f714af58f57bf8319a8b6e85242115f37f5d /libavformat/matroska.h | |
| parent | e9f2e9715b2bf7e379174b4ca3d23b11526561c0 (diff) | |
| parent | 59d7bb99b6a963b7e11c637228b2203adf535eee (diff) | |
| download | ffmpeg-a9821bdafb3a8dc1f390b79c84f86fb94a46043b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
4xm: check bitstream_size boundary before using it
Conflicts:
libavcodec/4xm.c
See: 9c661e95
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroska.h')
0 files changed, 0 insertions, 0 deletions