Skip to content

F
ffmpeg
Commit 96e9b96f authored by Anton Khirnov's avatar Anton Khirnov
Browse files
Options

lavc: remove disabled FF_API_SNOW_GLOBAL_OPTS cruft.

parent b9de160c
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 6 deletions
libavcodec/avcodec.h
View file @ 96e9b96f
...@@ -596,9 +596,6 @@ typedef struct RcOverride{ ...@@ -596,9 +596,6 @@ typedef struct RcOverride{
#if FF_API_MJPEG_GLOBAL_OPTS #if FF_API_MJPEG_GLOBAL_OPTS
#define CODEC_FLAG_EXTERN_HUFF 0x1000 ///< Use external Huffman table (for MJPEG). #define CODEC_FLAG_EXTERN_HUFF 0x1000 ///< Use external Huffman table (for MJPEG).
#endif #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
/** /**
* @} * @}
*/ */
......
libavcodec/version.h
View file @ 96e9b96f
...@@ -41,9 +41,6 @@ ...@@ -41,9 +41,6 @@
#ifndef FF_API_REQUEST_CHANNELS #ifndef FF_API_REQUEST_CHANNELS
#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 55) #define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 55)
#endif #endif
#ifndef FF_API_SNOW_GLOBAL_OPTS
#define FF_API_SNOW_GLOBAL_OPTS (LIBAVCODEC_VERSION_MAJOR < 54)
#endif
#ifndef FF_API_MJPEG_GLOBAL_OPTS #ifndef FF_API_MJPEG_GLOBAL_OPTS
#define FF_API_MJPEG_GLOBAL_OPTS (LIBAVCODEC_VERSION_MAJOR < 54) #define FF_API_MJPEG_GLOBAL_OPTS (LIBAVCODEC_VERSION_MAJOR < 54)
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment