aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/flvdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-12-30 13:54:50 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-12-30 13:54:50 +0100
commit2ce43b37fc46e3744d9d5e1baa1280c48ef7b1bf (patch)
tree24ca5287a90069a324ee49ad251f0d9a69ca0aea /libavformat/flvdec.c
parent613001d75fee9dfef14fb000cac8c67ac6381e97 (diff)
parent6dd93ee6f1b050ad7c4b247899e83efa293ee405 (diff)
downloadffmpeg-2ce43b37fc46e3744d9d5e1baa1280c48ef7b1bf.tar.gz
Merge commit '6dd93ee6f1b050ad7c4b247899e83efa293ee405'
* commit '6dd93ee6f1b050ad7c4b247899e83efa293ee405': hlsenc: check append_entry return value hlsenc: use the basename to generate the list entries avstring: add av_basename and av_dirname Conflicts: Changelog doc/APIchanges libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/flvdec.c')
0 files changed, 0 insertions, 0 deletions