diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-16 16:51:45 +0000 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-16 16:51:45 +0000 |
commit | c63da6e91630b72fa5916314910cb35e82331f70 (patch) | |
tree | 14404ba40f2700a4e38eb81d34693a35e2a8b1bb /libavcodec/webvttenc.c | |
parent | 32766877b4e1a7eeacfbca50c55d55ce8bb7b73d (diff) | |
parent | 9cac1b4b4f1532fb2aeef54799285360656be5eb (diff) | |
download | ffmpeg-c63da6e91630b72fa5916314910cb35e82331f70.tar.gz |
Merge commit '9cac1b4b4f1532fb2aeef54799285360656be5eb'
* commit '9cac1b4b4f1532fb2aeef54799285360656be5eb':
qsvenc: Add private option to replace coder_type
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/webvttenc.c')
0 files changed, 0 insertions, 0 deletions