diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 18:08:45 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 18:08:45 +0000 |
| commit | dc61014319bacd28b1a6c15976e72356b0870e97 (patch) | |
| tree | a37a6fceeffe017406a250af560c92024ab87938 /libavcodec/xsubenc.c | |
| parent | 79127dbbeffa87243c92af2befc09ad63bcbd1a1 (diff) | |
| parent | f273f7fb25b68792be481c9241b0ec2876e41f35 (diff) | |
| download | ffmpeg-dc61014319bacd28b1a6c15976e72356b0870e97.tar.gz | |
Merge commit 'f273f7fb25b68792be481c9241b0ec2876e41f35'
This commit is a no-op. We already set this.
* commit 'f273f7fb25b68792be481c9241b0ec2876e41f35':
mkv: Force the full parsing of mp3
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/xsubenc.c')
0 files changed, 0 insertions, 0 deletions