diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-28 16:54:26 +0000 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-28 16:57:04 +0000 |
commit | 5b0d4c247a3c3ba8a8ece70b31354121645c8320 (patch) | |
tree | 9fe83a0d04bff7be533c99a6774c3ecfd529e50c /libavformat/segment.c | |
parent | 0e3e3656d31a7e1e595ccb5ca3acfc76a23d785e (diff) | |
parent | 96c373c7704aeb1cc1d2c275fbb5d71777665589 (diff) | |
download | ffmpeg-5b0d4c247a3c3ba8a8ece70b31354121645c8320.tar.gz |
Merge commit '96c373c7704aeb1cc1d2c275fbb5d71777665589'
* commit '96c373c7704aeb1cc1d2c275fbb5d71777665589':
lavc: Move context_model to codec private options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavformat/segment.c')
0 files changed, 0 insertions, 0 deletions