diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-25 01:05:10 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-25 01:09:00 +0100 |
commit | 53dd75e91154100a83b11f6ef9dfd15d79bcc3aa (patch) | |
tree | 28d727a541c482d942304d80162b537fcab2580a /ffmpeg_filter.c | |
parent | 3130e5be92858b9a15622965cacc9fe59f5336c2 (diff) | |
parent | da7e561964ee833678dc24fae0b0265358126d1e (diff) | |
download | ffmpeg-53dd75e91154100a83b11f6ef9dfd15d79bcc3aa.tar.gz |
Merge commit 'da7e561964ee833678dc24fae0b0265358126d1e'
* commit 'da7e561964ee833678dc24fae0b0265358126d1e':
matroskaenc: Allow writing track "forced" flag
See: d88d0b6db6bd77269e3c2d3b4894c072f3860671
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_filter.c')
0 files changed, 0 insertions, 0 deletions