diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 19:23:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 19:23:00 +0200 |
| commit | 25f4e9387d0efd6fe2ac51d78eb681c542a6f82d (patch) | |
| tree | 436efd419bb560e735df6afd621be3fd8a95636d /libavcodec/avcodec.h | |
| parent | ae6ba2db8ff811fa1fe23c5abffcc8086dcbc052 (diff) | |
| parent | 530c1441fd1426b6a4bb33485ff3226e1ae0ad45 (diff) | |
Merge commit '530c1441fd1426b6a4bb33485ff3226e1ae0ad45'
* commit '530c1441fd1426b6a4bb33485ff3226e1ae0ad45':
lavc: make lmax/lmin into private options of mpegvideo encoders
Conflicts:
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 1c27fd4807..6e44a9068b 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2372,19 +2372,19 @@ typedef struct AVCodecContext { */ int context_model; +#if FF_API_MPV_OPT /** - * minimum Lagrange multiplier - * - encoding: Set by user. - * - decoding: unused + * @deprecated use encoder private options instead */ + attribute_deprecated int lmin; /** - * maximum Lagrange multiplier - * - encoding: Set by user. - * - decoding: unused + * @deprecated use encoder private options instead */ + attribute_deprecated int lmax; +#endif /** * frame skip threshold |