diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-06-26 14:34:53 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-06-26 14:34:53 +0200 |
| commit | 69c38d64d745c678f2f596f5932a5121b7aafc07 (patch) | |
| tree | 35a4f898c2b5b68474ed3c0a90a3d7d8cdb6af0f /libavcodec/version.h | |
| parent | 6988cf2969d777ebac84d241123883357375dc6c (diff) | |
| parent | 04fc8e24a091ed1d77d7a3c0cbcfe60baec19a9f (diff) | |
| download | ffmpeg-69c38d64d745c678f2f596f5932a5121b7aafc07.tar.gz | |
Merge commit '04fc8e24a091ed1d77d7a3c0cbcfe60baec19a9f'
* commit '04fc8e24a091ed1d77d7a3c0cbcfe60baec19a9f':
lavc: deprecate avcodec_get_context_defaults3()
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/version.h')
| -rw-r--r-- | libavcodec/version.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index b3dc8e8418..6ce6fc7715 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -220,6 +220,9 @@ #ifndef FF_API_COPY_CONTEXT #define FF_API_COPY_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 59) #endif +#ifndef FF_API_GET_CONTEXT_DEFAULTS +#define FF_API_GET_CONTEXT_DEFAULTS (LIBAVCODEC_VERSION_MAJOR < 59) +#endif #ifndef FF_API_NVENC_OLD_NAME #define FF_API_NVENC_OLD_NAME (LIBAVCODEC_VERSION_MAJOR < 59) #endif |