diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-03 03:40:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-03 03:40:22 +0200 |
| commit | a8ab64d2f70029a87467f75d1412bf6d13664b64 (patch) | |
| tree | 1792a7f59dabf8f277d4f6db49d6a52bf0464d88 /libavcodec/avcodec.h | |
| parent | e15e78f391abf4e037352cd783f6fa3c6b843d94 (diff) | |
| parent | 910247f1720c6aae422723c05dac6d0b19f20bec (diff) | |
| download | ffmpeg-a8ab64d2f70029a87467f75d1412bf6d13664b64.tar.gz | |
Merge commit '910247f1720c6aae422723c05dac6d0b19f20bec'
* commit '910247f1720c6aae422723c05dac6d0b19f20bec':
lavc: Deprecate avctx.{inter,intra}_quant_bias
Conflicts:
libavcodec/mpegvideo_enc.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 6391cf35f1..e367399deb 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1761,20 +1761,18 @@ typedef struct AVCodecContext { */ int me_range; +#if FF_API_QUANT_BIAS /** - * intra quantizer bias - * - encoding: Set by user. - * - decoding: unused + * @deprecated use encoder private option instead */ - int intra_quant_bias; + attribute_deprecated int intra_quant_bias; #define FF_DEFAULT_QUANT_BIAS 999999 /** - * inter quantizer bias - * - encoding: Set by user. - * - decoding: unused + * @deprecated use encoder private option instead */ - int inter_quant_bias; + attribute_deprecated int inter_quant_bias; +#endif /** * slice flags |