diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 01:21:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 01:29:24 +0200 |
| commit | 287602f9d80f4a816c0e9a3a9c0d810de8dc94cb (patch) | |
| tree | 06bd62c1fe2e58ca1bd2578fe5effe60e60f9a28 /libavutil/version.h | |
| parent | 97f8c7a03eddacd9b6450423cc21a801e002f01f (diff) | |
| parent | 472f9ed312ec784f7c72876b77163f4741880d05 (diff) | |
Merge commit '472f9ed312ec784f7c72876b77163f4741880d05'
* commit '472f9ed312ec784f7c72876b77163f4741880d05':
Remove obsolete FF_API_AVFRAME_COLORSPACE cruft.
Conflicts:
libavcodec/utils.c
libavutil/frame.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/version.h')
| -rw-r--r-- | libavutil/version.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavutil/version.h b/libavutil/version.h index a086af0520..b84e25d7bf 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -137,9 +137,6 @@ #ifndef FF_API_OPT_TYPE_METADATA #define FF_API_OPT_TYPE_METADATA (LIBAVUTIL_VERSION_MAJOR < 55) #endif -#ifndef FF_API_AVFRAME_COLORSPACE -#define FF_API_AVFRAME_COLORSPACE (LIBAVUTIL_VERSION_MAJOR >= 52) -#endif #ifndef FF_CONST_AVUTIL53 |