diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-28 15:21:21 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-28 15:22:19 +0000 |
| commit | 7c6e86c0cec17dfc020d58c82f4f1af5fcaea6c1 (patch) | |
| tree | 55ab3a10f5d4333bfa6d4b628c404abe3d42922c /libavcodec/avcodec.h | |
| parent | 13be46c08e59141408f1a7afd4737826afa87f11 (diff) | |
| parent | 5764d38173661c29d954711dd5abfddf709e9ba4 (diff) | |
Merge commit '5764d38173661c29d954711dd5abfddf709e9ba4'
* commit '5764d38173661c29d954711dd5abfddf709e9ba4':
lavc: Move chromaoffset 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 428c70f6e2..03df8d504d 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2209,12 +2209,11 @@ typedef struct AVCodecContext { */ int refs; - /** - * chroma qp offset from luma - * - encoding: Set by user. - * - decoding: unused - */ +#if FF_API_PRIVATE_OPT + /** @deprecated use encoder private options instead */ + attribute_deprecated int chromaoffset; +#endif #if FF_API_UNUSED_MEMBERS /** |