diff options
| author | Francesco Cosoleto <cosoleto@gmail.com> | 2008-09-28 19:11:26 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2008-09-28 19:11:26 +0000 |
| commit | 30ab4deda8d62280a93a658a3d97b7a59670e66f (patch) | |
| tree | 9791a2ab9162b016bef12b59643b48d3f0849331 /libavcodec | |
| parent | b235dbb05ba4473a11f0e5a4aed9610db1eb6628 (diff) | |
| download | ffmpeg-30ab4deda8d62280a93a658a3d97b7a59670e66f.tar.gz | |
Document the directpred auto value.
Patch by Francesco Cosoleto cosoleto ^^AT^^ gmail @@dot@@ com
Originally committed as revision 15448 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 2 | ||||
| -rw-r--r-- | libavcodec/utils.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index c2f7687234..dfd7264458 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2104,7 +2104,7 @@ typedef struct AVCodecContext { #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 --git a/libavcodec/utils.c b/libavcodec/utils.c index cf00d2552c..e56b9870a5 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -691,7 +691,7 @@ static const AVOption options[]={ {"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"}, |