Merge commit 'c4f7bee0872d5e2e0e91673dd4b0f18de4a3d866'

* commit 'c4f7bee0872d5e2e0e91673dd4b0f18de4a3d866': lavc: deprecate unused mb_threshold field Conflicts: libavcodec/options_table.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-18 15:42:29 +02:00
parent 8be1120deb c4f7bee087
commit 1a5871d1be
3 changed files with 4 additions and 12 deletions
--- 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