diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-16 23:36:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-16 23:36:33 +0100 |
| commit | ec9aef565291b1ab6c809030b2697fcbdde79a60 (patch) | |
| tree | 4982484580d8d4a75ce8181303ddbee2c3ec8d35 | |
| parent | 484f8d77c6ecf995ac89d1071d3be0cae1f5326c (diff) | |
| parent | b068660ffa73f226cc03a67e214b8540fc1e11c4 (diff) | |
| download | ffmpeg-ec9aef565291b1ab6c809030b2697fcbdde79a60.tar.gz | |
Merge commit 'b068660ffa73f226cc03a67e214b8540fc1e11c4'
* commit 'b068660ffa73f226cc03a67e214b8540fc1e11c4':
lavc: deprecate CODEC_CAP_NEG_LINESIZES
Conflicts:
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/avcodec.h | 6 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 67dc49f4ed..0c573e6c32 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -825,12 +825,12 @@ typedef struct RcOverride{ * Codec should fill in channel configuration and samplerate instead of container */ #define CODEC_CAP_CHANNEL_CONF 0x0400 - +#if FF_API_NEG_LINESIZES /** - * Codec is able to deal with negative linesizes + * @deprecated no codecs use this capability */ #define CODEC_CAP_NEG_LINESIZES 0x0800 - +#endif /** * Codec supports frame-level multithreading. */ diff --git a/libavcodec/version.h b/libavcodec/version.h index 19cefac482..a6ee4cffd6 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -135,5 +135,8 @@ #ifndef FF_API_FAST_MALLOC #define FF_API_FAST_MALLOC (LIBAVCODEC_VERSION_MAJOR < 56) #endif +#ifndef FF_API_NEG_LINESIZES +#define FF_API_NEG_LINESIZES (LIBAVCODEC_VERSION_MAJOR < 56) +#endif #endif /* AVCODEC_VERSION_H */ |