diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 15:04:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 15:04:42 +0200 |
| commit | c48e8d9dca550327b88106276aed17f87b23b7fe (patch) | |
| tree | 22691e94c032d6390a6e1a28c3bcf2dbea2f33c0 /libavcodec/avcodec.h | |
| parent | fc67d937cc73fb68ab8d840e319e89c52df79c3d (diff) | |
| parent | 59b55c494e01de09dfd7cbf9cbbe7223265ac283 (diff) | |
| download | ffmpeg-c48e8d9dca550327b88106276aed17f87b23b7fe.tar.gz | |
Merge commit '59b55c494e01de09dfd7cbf9cbbe7223265ac283'
* commit '59b55c494e01de09dfd7cbf9cbbe7223265ac283':
lavc: deprecate unused me_threshold field
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 5ee6b00acb..4e2e897349 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1794,14 +1794,13 @@ typedef struct AVCodecContext { */ int noise_reduction; +#if FF_API_MPV_OPT /** - * Motion estimation threshold below which no motion estimation is - * performed, but instead the user specified motion vectors are used. - * - * - encoding: Set by user. - * - decoding: unused + * @deprecated this field is unused */ + attribute_deprecated int me_threshold; +#endif /** * Macroblock threshold below which the user specified macroblock types will be used. |