diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-01 17:14:46 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-01 17:14:46 +0100 |
| commit | 5c06fc4bd88eddb8f8d4fef689fb48d006486dd2 (patch) | |
| tree | f85fed0f469c51f685f85c4f5af12220ad74a2bf /libavformat/subtitles.c | |
| parent | 95daa9e09aeccf6ccef4b5c08097f6b5b581de15 (diff) | |
| parent | 2d0432d918a71468419b7ac1e543ab3b399d3d37 (diff) | |
| download | ffmpeg-5c06fc4bd88eddb8f8d4fef689fb48d006486dd2.tar.gz | |
Merge commit '2d0432d918a71468419b7ac1e543ab3b399d3d37'
* commit '2d0432d918a71468419b7ac1e543ab3b399d3d37':
vocdec: put the code not shared with other demuxers under appropriate ifdef
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavformat/subtitles.c')
0 files changed, 0 insertions, 0 deletions