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 | 99ace37e68c122f0b051ac2937535960238b38f4 (patch) | |
| tree | 57a8ce9d263bfbc0e3b7a47f84bd577e1ecf3c2e /libavcodec/avcodec.h | |
| parent | 96e9b96fcd394dcaeebf7da3f94b0b7de663ecec (diff) | |
| download | ffmpeg-99ace37e68c122f0b051ac2937535960238b38f4.tar.gz | |
lavc: remove disabled FF_API_MJPEG_GLOBAL_OPTS cruft.
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 0455b7b03a..d844170c16 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -588,17 +588,6 @@ typedef struct RcOverride{ #define CODEC_FLAG2_LOCAL_HEADER 0x00000008 ///< Place global headers at every keyframe instead of in extradata. #define CODEC_FLAG2_SKIP_RD 0x00004000 ///< RD optimal MB level residual skipping #define CODEC_FLAG2_CHUNKS 0x00008000 ///< Input bitstream might be truncated at a packet boundaries instead of only at frame boundaries. -/** - * @defgroup deprecated_flags Deprecated codec flags - * Use corresponding private codec options instead. - * @{ - */ -#if FF_API_MJPEG_GLOBAL_OPTS -#define CODEC_FLAG_EXTERN_HUFF 0x1000 ///< Use external Huffman table (for MJPEG). -#endif -/** - * @} - */ /* Unsupported options : * Syntax Arithmetic coding (SAC) |