diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-08-22 07:55:34 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-08-24 14:32:24 +0200 |
| commit | c5dd0bc4ca977924825a74080ff1c294dda01427 (patch) | |
| tree | f3a5e105ff0a9e18f490f4db607c31eaa45966d5 /libavcodec/avcodec.h | |
| parent | d4b967131842e7c225e5f83cb82337d4474a0bb7 (diff) | |
| download | ffmpeg-c5dd0bc4ca977924825a74080ff1c294dda01427.tar.gz | |
libx264: add 'weightp' private option.
Deprecate corresponding global option.
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 77544e3837..414b1502f1 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2712,6 +2712,7 @@ typedef struct AVCodecContext { */ int (*execute2)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg, int jobnr, int threadnr), void *arg2, int *ret, int count); +#if FF_API_X264_GLOBAL_OPTS /** * explicit P-frame weighted prediction analysis method * 0: off @@ -2720,9 +2721,8 @@ typedef struct AVCodecContext { * - encoding: Set by user. * - decoding: unused */ - int weighted_p_pred; + attribute_deprecated int weighted_p_pred; -#if FF_API_X264_GLOBAL_OPTS /** * AQ mode * 0: Disabled |