aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/hls.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-09-20 11:56:26 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-09-20 12:06:15 +0200
commit04ee57ce0aba34722e47419fce5977f81ea09d07 (patch)
tree09ae488114b194c24303a226c831fc0d2eb25206 /libavformat/hls.c
parent018e0db5eff21d2b7e546bc63f4807dea782d00d (diff)
parentbb461370e34b1fa1637f34ce7d37b934ddb472d5 (diff)
downloadffmpeg-04ee57ce0aba34722e47419fce5977f81ea09d07.tar.gz
Merge commit 'bb461370e34b1fa1637f34ce7d37b934ddb472d5'
* commit 'bb461370e34b1fa1637f34ce7d37b934ddb472d5': asfenc: mux chapters in ASF files using an ASF "marker" section Conflicts: Changelog libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/hls.c')
0 files changed, 0 insertions, 0 deletions