diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 15:58:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 15:58:55 +0200 |
| commit | 709ab39cb9a4887a08ed0d8fc25c2ddc79731f85 (patch) | |
| tree | 94e858b94de9fd21b4d32504fa8466717306d3cd /libavcodec/avcodec.h | |
| parent | 1a5871d1bec6863dfee05c9cc8b97e2307530ce6 (diff) | |
| parent | 15ec053c4c0b198a2e93eb8e60c8f41e091e0c40 (diff) | |
Merge commit '15ec053c4c0b198a2e93eb8e60c8f41e091e0c40'
* commit '15ec053c4c0b198a2e93eb8e60c8f41e091e0c40':
lavc: make border_masking into private options of mpegvideo encoders
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 79c2bf10e2..1c27fd4807 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1829,13 +1829,13 @@ typedef struct AVCodecContext { */ int skip_bottom; +#if FF_API_MPV_OPT /** - * Border processing masking, raises the quantizer for mbs on the borders - * of the picture. - * - encoding: Set by user. - * - decoding: unused + * @deprecated use encoder private options instead */ + attribute_deprecated float border_masking; +#endif /** * minimum MB lagrange multipler |