# HG changeset patch # User stefano # Date 1222629086 0 # Node ID 9daf67c7e880b7769ca33d6966b5fefc5ffc89f1 # Parent 6375f3f92e749b2dc46a28cff3b764edabcb3bbe Document the directpred auto value. Patch by Francesco Cosoleto cosoleto ^^AT^^ gmail @@dot@@ com diff -r 6375f3f92e74 -r 9daf67c7e880 avcodec.h --- a/avcodec.h Sun Sep 28 16:16:05 2008 +0000 +++ b/avcodec.h Sun Sep 28 19:11:26 2008 +0000 @@ -2104,7 +2104,7 @@ #define X264_PART_B8X8 0x100 /* Analyze b16x8, b8x16 and b8x8 */ /** - * direct MV prediction mode - 0 (none), 1 (spatial), 2 (temporal) + * direct MV prediction mode - 0 (none), 1 (spatial), 2 (temporal), 3 (auto) * - encoding: Set by user. * - decoding: unused */ diff -r 6375f3f92e74 -r 9daf67c7e880 utils.c --- a/utils.c Sun Sep 28 16:16:05 2008 +0000 +++ b/utils.c Sun Sep 28 19:11:26 2008 +0000 @@ -691,7 +691,7 @@ {"chromaoffset", "chroma qp offset from luma", OFFSET(chromaoffset), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, {"bframebias", "influences how often B-frames are used", OFFSET(bframebias), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, {"trellis", "rate-distortion optimal quantization", OFFSET(trellis), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|A|E}, -{"directpred", "direct mv prediction mode - 0 (none), 1 (spatial), 2 (temporal)", OFFSET(directpred), FF_OPT_TYPE_INT, 2, INT_MIN, INT_MAX, V|E}, +{"directpred", "direct mv prediction mode - 0 (none), 1 (spatial), 2 (temporal), 3 (auto)", OFFSET(directpred), FF_OPT_TYPE_INT, 2, INT_MIN, INT_MAX, V|E}, {"bpyramid", "allows B-frames to be used as references for predicting", 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_BPYRAMID, INT_MIN, INT_MAX, V|E, "flags2"}, {"wpred", "weighted biprediction for b-frames (H.264)", 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_WPRED, INT_MIN, INT_MAX, V|E, "flags2"}, {"mixed_refs", "one reference per partition, as opposed to one reference per macroblock", 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_MIXED_REFS, INT_MIN, INT_MAX, V|E, "flags2"},