diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 16:52:34 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 16:52:34 +0400 |
commit | f391e405dfde35bfb3fea9ccc09bd67b5cc0a8f2 (patch) | |
tree | 739e823660aa365a392c509acd1ac1686272029f /libavutil/version.h | |
parent | d6135a886d85bdbf271c55a238c3336670adc742 (diff) | |
parent | e002e3291e6dc7953f843abf56fc14f08f238b21 (diff) |
Merge commit 'e002e3291e6dc7953f843abf56fc14f08f238b21'
* commit 'e002e3291e6dc7953f843abf56fc14f08f238b21':
Use the new aes/md5/sha/tree allocation functions
avutil: Add functions for allocating opaque contexts for algorithms
svq3: fix pointer type warning
svq3: replace unsafe pointer casting with intreadwrite macros
parseutils-test: various cleanups
Conflicts:
doc/APIchanges
libavcodec/svq3.c
libavutil/parseutils.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/version.h')
-rw-r--r-- | libavutil/version.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavutil/version.h b/libavutil/version.h index d807a1955c..6c313e4202 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -39,7 +39,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 51 -#define LIBAVUTIL_VERSION_MINOR 74 +#define LIBAVUTIL_VERSION_MINOR 75 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ @@ -84,6 +84,9 @@ #ifndef FF_API_PIX_FMT #define FF_API_PIX_FMT (LIBAVUTIL_VERSION_MAJOR < 52) #endif +#ifndef FF_API_CONTEXT_SIZE +#define FF_API_CONTEXT_SIZE (LIBAVUTIL_VERSION_MAJOR < 52) +#endif /** * @} |