diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-12 14:33:57 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-12 14:34:03 +0100 |
| commit | 97946b20b6d8c8746ca41490534d7ecceaab799b (patch) | |
| tree | a34eec4a113e153bd99df74646cde88c4c69e146 /ffmpeg.c | |
| parent | dd4fb2339f76a958bd7e63e5ac18b8c10852ae1a (diff) | |
| parent | f3ed484953b81856e40239d2410058a96188b2be (diff) | |
| download | ffmpeg-97946b20b6d8c8746ca41490534d7ecceaab799b.tar.gz | |
Merge commit 'f3ed484953b81856e40239d2410058a96188b2be'
* commit 'f3ed484953b81856e40239d2410058a96188b2be':
h264_mp4toannexb_bsf: do not fail on annex B extradata
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions