diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 15:04:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 15:04:04 +0100 |
| commit | 7c888ae746da0d9f6a11bab9758c01d641b49d7b (patch) | |
| tree | 22862c9f615cb2e636feec9ffd1d5e2a675295ed /libavutil/version.h | |
| parent | 2925571278bf09702564dfedd5e7731a112dd1f0 (diff) | |
| parent | cce3e0a49f0dd030262c28d9c53de0bd2fd909c4 (diff) | |
| download | ffmpeg-streaming-7c888ae746da0d9f6a11bab9758c01d641b49d7b.zip ffmpeg-streaming-7c888ae746da0d9f6a11bab9758c01d641b49d7b.tar.gz | |
Merge commit 'cce3e0a49f0dd030262c28d9c53de0bd2fd909c4'
* commit 'cce3e0a49f0dd030262c28d9c53de0bd2fd909c4':
Move av_fast_{m,re}alloc from lavc to lavu.
Conflicts:
libavcodec/avcodec.h
libavcodec/utils.c
libavutil/mem.c
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 bd5e7b8..05c79fa 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -75,7 +75,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 52 -#define LIBAVUTIL_VERSION_MINOR 52 +#define LIBAVUTIL_VERSION_MINOR 53 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |
