diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-24 12:47:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-24 12:47:18 +0100 |
| commit | 4a6096e48134b5e6db4ec1f2af9ad2278219186a (patch) | |
| tree | ae621534b2dcc19716dd30c87a8367265ce58d5c /libavdevice | |
| parent | d66ca43fc1f62f057d43140e7a5905390739bfc7 (diff) | |
| parent | b76df6efb6816901796dd76439382baa43b50ef6 (diff) | |
| download | ffmpeg-4a6096e48134b5e6db4ec1f2af9ad2278219186a.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
lavf/matroskaenc: List subtitle codecs with fake codec_tags to allow remuxing.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice')
0 files changed, 0 insertions, 0 deletions