diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-11 16:46:22 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-11 16:46:30 +0100 |
| commit | 48fb5294d03f1d25ec8ba370a0cb4258fc21e88e (patch) | |
| tree | 23de73100a257878069ed0cf9875fb99dfaca128 /libavformat/subtitles.h | |
| parent | 9d48aa6d7df6fa50a8a2c30f5c1774af8a083db0 (diff) | |
| parent | 567d6d5f9d1400f00445183b3477391f58979aa3 (diff) | |
| download | ffmpeg-48fb5294d03f1d25ec8ba370a0cb4258fc21e88e.tar.gz | |
Merge commit '567d6d5f9d1400f00445183b3477391f58979aa3'
* commit '567d6d5f9d1400f00445183b3477391f58979aa3':
avprobe: add local per-stream state
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavformat/subtitles.h')
0 files changed, 0 insertions, 0 deletions