diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-09 01:17:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-09 01:17:49 +0200 |
| commit | 4a2bcdb28b510ae1378b82acf422f8c8ff8a4635 (patch) | |
| tree | d4853a92b57fe47e3a618e8833fd7a309dac8e8a /libavcodec/avcodec.h | |
| parent | edfcbf7c83cb7828c0531e788ba8c5c47b07fc5f (diff) | |
| parent | 1761ab838c75223a6b97d8c0720d09275374c53d (diff) | |
Merge commit '1761ab838c75223a6b97d8c0720d09275374c53d'
* commit '1761ab838c75223a6b97d8c0720d09275374c53d':
lavc: Deprecate avctx.rc_strategy
Conflicts:
libavcodec/mpegvideo.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index e367399deb..738f4db9cb 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1538,9 +1538,11 @@ typedef struct AVCodecContext { */ float b_quant_factor; - /** obsolete FIXME remove */ - int rc_strategy; +#if FF_API_RC_STRATEGY + /** @deprecated use codec private option instead */ + attribute_deprecated int rc_strategy; #define FF_RC_STRATEGY_XVID 1 +#endif int b_frame_strategy; |