diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-30 13:54:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-30 13:54:50 +0100 |
| commit | 2ce43b37fc46e3744d9d5e1baa1280c48ef7b1bf (patch) | |
| tree | 24ca5287a90069a324ee49ad251f0d9a69ca0aea /libavutil/cpu.h | |
| parent | 613001d75fee9dfef14fb000cac8c67ac6381e97 (diff) | |
| parent | 6dd93ee6f1b050ad7c4b247899e83efa293ee405 (diff) | |
| download | ffmpeg-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 'libavutil/cpu.h')
0 files changed, 0 insertions, 0 deletions