diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-30 14:02:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-30 14:02:19 +0100 |
| commit | 19e1c8e4f203a9445aadfc683449968a59f9aa81 (patch) | |
| tree | d0ff4a8f37f2e3dbd927c120bf519d76ac527010 /libavformat/mpeg.h | |
| parent | 2ce43b37fc46e3744d9d5e1baa1280c48ef7b1bf (diff) | |
| parent | 0448f26c97c5ab4858d31e456a4f1738ae783242 (diff) | |
| download | ffmpeg-19e1c8e4f203a9445aadfc683449968a59f9aa81.tar.gz | |
Merge commit '0448f26c97c5ab4858d31e456a4f1738ae783242'
* commit '0448f26c97c5ab4858d31e456a4f1738ae783242':
hlsenc: keep the playlist to the correct number of items
hlsenc: use the segment filename in the playlist entry
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpeg.h')
0 files changed, 0 insertions, 0 deletions