diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-01 18:41:41 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-01 18:41:41 +0400 |
| commit | cac07d0e103656a2436ea04b700128ce436a4d06 (patch) | |
| tree | 26ad63f72adfeb90f1f5857cb5c458cdd2d77ff1 /libavcodec/avcodec.h | |
| parent | b7dd250b7545ece973bd4c92fd7f93ce042fa911 (diff) | |
| parent | 5fccedaa67390ccddd6347c8e1c71b7664558bcd (diff) | |
Merge commit '5fccedaa67390ccddd6347c8e1c71b7664558bcd'
* commit '5fccedaa67390ccddd6347c8e1c71b7664558bcd':
lavc: deprecate CODEC_FLAG_INPUT_PRESERVED
Conflicts:
doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index d3ad82edb4..d2028fa306 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -747,12 +747,13 @@ typedef struct RcOverride{ #define CODEC_FLAG_QPEL 0x0010 ///< Use qpel MC. #define CODEC_FLAG_GMC 0x0020 ///< Use GMC. #define CODEC_FLAG_MV0 0x0040 ///< Always try a MB with MV=<0,0>. +#if FF_API_INPUT_PRESERVED /** - * The parent program guarantees that the input for B-frames containing - * streams is not written to for at least s->max_b_frames+1 frames, if - * this is not set the input will be copied. + * @deprecated passing reference-counted frames to the encoders replaces this + * flag */ #define CODEC_FLAG_INPUT_PRESERVED 0x0100 +#endif #define CODEC_FLAG_PASS1 0x0200 ///< Use internal 2pass ratecontrol in first pass mode. #define CODEC_FLAG_PASS2 0x0400 ///< Use internal 2pass ratecontrol in second pass mode. #define CODEC_FLAG_GRAY 0x2000 ///< Only decode/encode grayscale. |