diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 14:46:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 14:46:41 +0100 |
| commit | b2cd0d709abdcf28bbeb1a04a4a0d141adf66256 (patch) | |
| tree | 34708dd7d07779770ba3340bf191aaab9ae83bf0 /libavcodec/version.h | |
| parent | dac87995295eeb45954b473f24e67ac7d103ba43 (diff) | |
| parent | 8df23e938b4022d6e6e9e1180ea6418abae74fda (diff) | |
| download | ffmpeg-b2cd0d709abdcf28bbeb1a04a4a0d141adf66256.tar.gz | |
Merge commit '8df23e938b4022d6e6e9e1180ea6418abae74fda'
* commit '8df23e938b4022d6e6e9e1180ea6418abae74fda':
lavc: postpone the removal of request_channels API.
AVFrame: deprecate all now unused fields
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/version.h')
| -rw-r--r-- | libavcodec/version.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index 6522c12e20..4bfba387c9 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -49,7 +49,7 @@ */ #ifndef FF_API_REQUEST_CHANNELS -#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 55) +#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 56) #endif #ifndef FF_API_ALLOC_CONTEXT #define FF_API_ALLOC_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 55) |