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/version.h | |
| parent | 613001d75fee9dfef14fb000cac8c67ac6381e97 (diff) | |
| parent | 6dd93ee6f1b050ad7c4b247899e83efa293ee405 (diff) | |
| download | ffmpeg-streaming-2ce43b37fc46e3744d9d5e1baa1280c48ef7b1bf.zip ffmpeg-streaming-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/version.h')
| -rw-r--r-- | libavutil/version.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/version.h b/libavutil/version.h index f5ccd1f..e47e0d1 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -75,7 +75,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 52 -#define LIBAVUTIL_VERSION_MINOR 12 +#define LIBAVUTIL_VERSION_MINOR 13 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |
