diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-01-22 10:56:42 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-01-27 10:38:34 +0100 |
| commit | 96e9b96fcd394dcaeebf7da3f94b0b7de663ecec (patch) | |
| tree | 045c7fc2db79d7339b2be77708e1e2acf8487934 | |
| parent | b9de160c3ef5979bc6c4358c25a17a13706cf410 (diff) | |
| download | ffmpeg-96e9b96fcd394dcaeebf7da3f94b0b7de663ecec.tar.gz | |
lavc: remove disabled FF_API_SNOW_GLOBAL_OPTS cruft.
| -rw-r--r-- | libavcodec/avcodec.h | 3 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index bc5e09c3fb..0455b7b03a 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 3265ceb9b6..9eee5c6cf7 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 |