diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-30 20:52:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-30 20:52:58 +0200 |
| commit | 8522dd380b2a0f98cfaafcf0ae64bd46ac031ae1 (patch) | |
| tree | 8e60197c31234012a8d7a8b52d26f7215269b151 /libavformat/rl2.c | |
| parent | 67979b593699ea02ba1b9c60db53e15dcd5fbc1c (diff) | |
| parent | c7603b3c243331057300337a61464e6ac4a605cb (diff) | |
| download | ffmpeg-8522dd380b2a0f98cfaafcf0ae64bd46ac031ae1.tar.gz | |
Merge commit 'c7603b3c243331057300337a61464e6ac4a605cb'
* commit 'c7603b3c243331057300337a61464e6ac4a605cb':
hls: Print start_number as first sequence value
Conflicts:
libavformat/hlsenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rl2.c')
0 files changed, 0 insertions, 0 deletions