diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-28 16:44:59 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-28 16:44:59 +0000 |
| commit | 0e3e3656d31a7e1e595ccb5ca3acfc76a23d785e (patch) | |
| tree | 144c6e7680198c13152d9cdd704c972f640a0216 /libavcodec/avcodec.h | |
| parent | b986a4625d0e67710f155a9816dbab186a98020e (diff) | |
| parent | 12b49769223234673db1003d9c43e7483ceb0282 (diff) | |
Merge commit '12b49769223234673db1003d9c43e7483ceb0282'
* commit '12b49769223234673db1003d9c43e7483ceb0282':
lavc: Move mpeg_quant to codec private options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 346573f5ef..8ba8ea84ee 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1844,12 +1844,11 @@ typedef struct AVCodecContext { */ int has_b_frames; - /** - * 0-> h263 quant 1-> mpeg quant - * - encoding: Set by user. - * - decoding: unused - */ +#if FF_API_PRIVATE_OPT + /** @deprecated use encoder private options instead */ + attribute_deprecated int mpeg_quant; +#endif /** * qscale factor between P and I-frames |