diff options
| author | Alfred E. Heggestad <alfred.heggestad@gmail.com> | 2018-03-28 08:54:32 +0200 |
|---|---|---|
| committer | Alfred E. Heggestad <alfred.heggestad@gmail.com> | 2018-03-28 08:54:32 +0200 |
| commit | b17201c25abe91becb386ac0ee1736664ce018f7 (patch) | |
| tree | c7123aab7de3f0823d8dfc42f85b202e30d9b290 | |
| parent | 02731ddef2cadd01e21bef6d3bcd94f0668f8a10 (diff) | |
avcodec: move backward defines to internal header file
| -rw-r--r-- | modules/avcodec/avcodec.h | 8 | ||||
| -rw-r--r-- | modules/avcodec/decode.c | 8 | ||||
| -rw-r--r-- | modules/avcodec/encode.c | 6 |
3 files changed, 8 insertions, 14 deletions
diff --git a/modules/avcodec/avcodec.h b/modules/avcodec/avcodec.h index f3a2b70..3511145 100644 --- a/modules/avcodec/avcodec.h +++ b/modules/avcodec/avcodec.h @@ -16,6 +16,14 @@ #endif +#if LIBAVUTIL_VERSION_MAJOR < 52 +#define AV_PIX_FMT_YUV420P PIX_FMT_YUV420P +#define AV_PIX_FMT_YUVJ420P PIX_FMT_YUVJ420P +#define AV_PIX_FMT_NV12 PIX_FMT_NV12 +#define AV_PIX_FMT_YUV444P PIX_FMT_YUV444P +#endif + + extern const uint8_t h264_level_idc; extern AVCodec *avcodec_h264enc; extern AVCodec *avcodec_h264dec; diff --git a/modules/avcodec/decode.c b/modules/avcodec/decode.c index 00f6654..0129490 100644 --- a/modules/avcodec/decode.c +++ b/modules/avcodec/decode.c @@ -16,14 +16,6 @@ #include "avcodec.h" -#if LIBAVUTIL_VERSION_MAJOR < 52 -#define AV_PIX_FMT_YUV420P PIX_FMT_YUV420P -#define AV_PIX_FMT_YUVJ420P PIX_FMT_YUVJ420P -#define AV_PIX_FMT_NV12 PIX_FMT_NV12 -#define AV_PIX_FMT_YUV444P PIX_FMT_YUV444P -#endif - - enum { DECODE_MAXSZ = 524288, }; diff --git a/modules/avcodec/encode.c b/modules/avcodec/encode.c index 0f885f4..ea543d8 100644 --- a/modules/avcodec/encode.c +++ b/modules/avcodec/encode.c @@ -20,12 +20,6 @@ #include "avcodec.h" -#if LIBAVUTIL_VERSION_MAJOR < 52 -#define AV_PIX_FMT_YUV420P PIX_FMT_YUV420P -#define AV_PIX_FMT_NV12 PIX_FMT_NV12 -#endif - - #ifndef AV_INPUT_BUFFER_MIN_SIZE #define AV_INPUT_BUFFER_MIN_SIZE FF_MIN_BUFFER_SIZE #endif |