diff options
| author | Michael Niedermayer <[email protected]> | 2015-06-30 12:59:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-06-30 12:59:16 +0200 |
| commit | 6d9dfb1267d0a5b23ed3e857526bbca74223313a (patch) | |
| tree | 590dc3dcddab0ff417b095d96a99f9621e7f8f88 /libavformat/mpegts.c | |
| parent | 3cd6b6aa0f847afeeac7742489f139ce39b4bdcb (diff) | |
| parent | 1b4c468477f3b8d372da8ef4e5405539ad9c1501 (diff) | |
Merge commit '1b4c468477f3b8d372da8ef4e5405539ad9c1501'
* commit '1b4c468477f3b8d372da8ef4e5405539ad9c1501':
riff: Validate the wav header size before trying to parse it
Conflicts:
libavformat/riffdec.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/mpegts.c')
0 files changed, 0 insertions, 0 deletions