From 96e9b96fcd394dcaeebf7da3f94b0b7de663ecec Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 22 Jan 2012 10:56:42 +0100 Subject: [PATCH] lavc: remove disabled FF_API_SNOW_GLOBAL_OPTS cruft. --- libavcodec/avcodec.h | 3 --- libavcodec/version.h | 3 --- 2 files changed, 6 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index bc5e09c..0455b7b 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -596,9 +596,6 @@ typedef struct RcOverride{ #if FF_API_MJPEG_GLOBAL_OPTS #define CODEC_FLAG_EXTERN_HUFF 0x1000 ///< Use external Huffman table (for MJPEG). #endif -#if FF_API_SNOW_GLOBAL_OPTS -#define CODEC_FLAG2_MEMC_ONLY 0x00001000 ///< Only do ME/MC (I frames -> ref, P frame -> ME+MC). -#endif /** * @} */ diff --git a/libavcodec/version.h b/libavcodec/version.h index 3265ceb..9eee5c6 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -41,9 +41,6 @@ #ifndef FF_API_REQUEST_CHANNELS #define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 55) #endif -#ifndef FF_API_SNOW_GLOBAL_OPTS -#define FF_API_SNOW_GLOBAL_OPTS (LIBAVCODEC_VERSION_MAJOR < 54) -#endif #ifndef FF_API_MJPEG_GLOBAL_OPTS #define FF_API_MJPEG_GLOBAL_OPTS (LIBAVCODEC_VERSION_MAJOR < 54) #endif -- 2.7.4