diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 15:42:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 15:42:29 +0200 |
| commit | 1a5871d1bec6863dfee05c9cc8b97e2307530ce6 (patch) | |
| tree | 21cc127f9296bc678848bdbbe31733b4ea800f12 /libavcodec/avcodec.h | |
| parent | 8be1120deb2b6bb7c5762071a116163d204d6ca8 (diff) | |
| parent | c4f7bee0872d5e2e0e91673dd4b0f18de4a3d866 (diff) | |
| download | ffmpeg-1a5871d1bec6863dfee05c9cc8b97e2307530ce6.tar.gz | |
Merge commit 'c4f7bee0872d5e2e0e91673dd4b0f18de4a3d866'
* commit 'c4f7bee0872d5e2e0e91673dd4b0f18de4a3d866':
lavc: deprecate unused mb_threshold field
Conflicts:
libavcodec/options_table.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 4e2e897349..79c2bf10e2 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1800,14 +1800,13 @@ typedef struct AVCodecContext { */ attribute_deprecated int me_threshold; -#endif /** - * Macroblock threshold below which the user specified macroblock types will be used. - * - encoding: Set by user. - * - decoding: unused + * @deprecated this field is unused */ + attribute_deprecated int mb_threshold; +#endif /** * precision of the intra DC coefficient - 8 |