diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 17:16:53 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 17:34:49 +0400 |
| commit | a33ed6bc74b6b8ada925c76c4084afcf8870a048 (patch) | |
| tree | 605fa1fc8e55698f892837e7d0191da5e5c34c1c /libavutil/version.h | |
| parent | f391e405dfde35bfb3fea9ccc09bd67b5cc0a8f2 (diff) | |
| parent | b7f1010c8fce09096057528f7cd29589ea1ae7df (diff) | |
Merge commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df'
* commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df':
tools: do not use av_pix_fmt_descriptors directly.
pixdesc: add functions for accessing pixel format descriptors.
build: add support for Tru64 (OSF/1)
md5: Allocate a normal private context for the opaque md5 context pointer
Conflicts:
cmdutils.c
doc/APIchanges
ffprobe.c
libavformat/md5enc.c
libavutil/version.h
tools/graph2dot.c
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 6c313e4202..25dd42dd66 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -39,7 +39,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 51 -#define LIBAVUTIL_VERSION_MINOR 75 +#define LIBAVUTIL_VERSION_MINOR 76 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ @@ -87,6 +87,9 @@ #ifndef FF_API_CONTEXT_SIZE #define FF_API_CONTEXT_SIZE (LIBAVUTIL_VERSION_MAJOR < 52) #endif +#ifndef FF_API_PIX_FMT_DESC +#define FF_API_PIX_FMT_DESC (LIBAVUTIL_VERSION_MAJOR < 52) +#endif /** * @} |