diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-18 23:09:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-18 23:13:31 +0200 |
| commit | 1ebc77bc7d68748598878c08c85a571b526a729f (patch) | |
| tree | 117f2f6b361c9b3649af288ce97047d3115b5fb4 /libavformat/hlsproto.c | |
| parent | eba453e03ffeec8bb79cdcf35698e0fa13cc6d6e (diff) | |
| parent | 49a242687cf44f86570b706db3c5912ff06bc6c2 (diff) | |
| download | ffmpeg-1ebc77bc7d68748598878c08c85a571b526a729f.tar.gz | |
Merge commit '49a242687cf44f86570b706db3c5912ff06bc6c2'
* commit '49a242687cf44f86570b706db3c5912ff06bc6c2':
doc: Document segment_list_type
Conflicts:
doc/muxers.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/hlsproto.c')
0 files changed, 0 insertions, 0 deletions