diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-27 20:06:01 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-27 20:06:01 +0000 |
| commit | e15e108885344b5cf8520a553ad93b742a95b6d3 (patch) | |
| tree | b70ed8f56f846a01150ecaef8e629ad994a49f7a /libavcodec/version.h | |
| parent | fa6c7ccc20d3dc8f220af31f10a159e1b7a13b92 (diff) | |
| parent | d43a165bda0eae95f4c7a168c7d13d94966c1a09 (diff) | |
| download | ffmpeg-e15e108885344b5cf8520a553ad93b742a95b6d3.tar.gz | |
Merge commit 'd43a165bda0eae95f4c7a168c7d13d94966c1a09'
* commit 'd43a165bda0eae95f4c7a168c7d13d94966c1a09':
imgconvert: Add the proper API guards to a deprecated function
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/version.h')
| -rw-r--r-- | libavcodec/version.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index 2dc83ba87c..61b3c545ca 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -60,6 +60,8 @@ #endif #ifndef FF_API_AVCODEC_RESAMPLE #define FF_API_AVCODEC_RESAMPLE FF_API_AUDIO_CONVERT +#ifndef FF_API_GETCHROMA +#define FF_API_GETCHROMA (LIBAVCODEC_VERSION_MAJOR < 58) #endif #ifndef FF_API_MISSING_SAMPLE #define FF_API_MISSING_SAMPLE (LIBAVCODEC_VERSION_MAJOR < 58) |