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:33 +0100 |
| commit | 9ce2a91b842bdb99fae0f153c5317d786a3f38d8 (patch) | |
| tree | 1914932018cd340a8b0300a759454c7ac48f6ec7 /libavcodec/avcodec.h | |
| parent | 7232bfbd9345e12fe31b2cf0b4a813f4fb0961ab (diff) | |
| download | ffmpeg-9ce2a91b842bdb99fae0f153c5317d786a3f38d8.tar.gz | |
lavc: remove disabled FF_API_MPEGVIDEO_GLOBAL_OPTS cruft.
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 3e38d3acf2..08a79f992c 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -667,18 +667,6 @@ typedef struct RcOverride{ * Use corresponding private codec options instead. * @{ */ -#if FF_API_MPEGVIDEO_GLOBAL_OPTS -#define CODEC_FLAG_OBMC 0x00000001 ///< OBMC -#define CODEC_FLAG_H263P_AIV 0x00000008 ///< H.263 alternative inter VLC -#define CODEC_FLAG_PART 0x0080 ///< Use data partitioning. -#define CODEC_FLAG_ALT_SCAN 0x00100000 ///< Use alternate scan. -#define CODEC_FLAG_H263P_UMV 0x02000000 ///< unlimited motion vector -#define CODEC_FLAG_H263P_SLICE_STRUCT 0x10000000 -#define CODEC_FLAG_SVCD_SCAN_OFFSET 0x40000000 ///< Will reserve space for SVCD scan offset user data. -#define CODEC_FLAG2_INTRA_VLC 0x00000800 ///< Use MPEG-2 intra VLC table. -#define CODEC_FLAG2_DROP_FRAME_TIMECODE 0x00002000 ///< timecode is in drop frame format. -#define CODEC_FLAG2_NON_LINEAR_QUANT 0x00010000 ///< Use MPEG-2 nonlinear quantizer. -#endif #if FF_API_MJPEG_GLOBAL_OPTS #define CODEC_FLAG_EXTERN_HUFF 0x1000 ///< Use external Huffman table (for MJPEG). #endif |