diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 18:27:00 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 18:27:32 +0000 |
| commit | 2ef37691a0597529280dcb5be90325687eadac26 (patch) | |
| tree | 5f9343adfb6241f5de29d23a99250a71a315cc97 /libavresample/arm | |
| parent | 8ae21fd95985377603c1a96e0086290fb866ab90 (diff) | |
| parent | bf7be043fcfda29c81ef2268885b4ccc643e7c49 (diff) | |
| download | ffmpeg-2ef37691a0597529280dcb5be90325687eadac26.tar.gz | |
Merge commit 'bf7be043fcfda29c81ef2268885b4ccc643e7c49'
This commit is a no-op. We already do this.
* commit 'bf7be043fcfda29c81ef2268885b4ccc643e7c49':
matroska: Always consider S_TEXT/UTF8 as SRT when demuxing
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavresample/arm')
0 files changed, 0 insertions, 0 deletions