diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-28 14:21:33 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-28 14:21:33 +0000 |
| commit | 4f32ccb61800ef1a0acf02010784da4f15adde44 (patch) | |
| tree | faf32743b2d433700e741917a60fe8fbfd68cd0a /libavcodec/avcodec.h | |
| parent | 2edd47582b4db2b89b821d6e809d5a4671487b0e (diff) | |
| parent | 84c4714f397c9c50eb9d49008cc1c08385f68f31 (diff) | |
Merge commit '84c4714f397c9c50eb9d49008cc1c08385f68f31'
* commit '84c4714f397c9c50eb9d49008cc1c08385f68f31':
lavc: Move brd_scale 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 89d605cda2..92e99e9128 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2189,12 +2189,11 @@ typedef struct AVCodecContext { */ int bidir_refine; - /** - * - * - encoding: Set by user. - * - decoding: unused - */ +#if FF_API_PRIVATE_OPT + /** @deprecated use encoder private options instead */ + attribute_deprecated int brd_scale; +#endif /** * minimum GOP size |