From: Loren Merritt Date: Thu, 27 Sep 2007 03:16:25 +0000 (+0000) Subject: oops, revert unrelated change X-Git-Tag: v0.5~7388 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=815d96a65d078a8c9a629eb1f38ebf7a04d88063;p=platform%2Fupstream%2Flibav.git oops, revert unrelated change Originally committed as revision 10597 to svn://svn.ffmpeg.org/ffmpeg/trunk --- diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 0a90b4a..3d4c2f2 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -670,7 +670,7 @@ static const AVOption options[]={ {"context", "context model", OFFSET(context_model), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, {"slice_flags", NULL, OFFSET(slice_flags), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX}, {"xvmc_acceleration", NULL, OFFSET(xvmc_acceleration), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX}, -{"mbd", "macroblock decision algorithm (high quality mode)", OFFSET(mb_decision), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|A|E, "mbd"}, +{"mbd", "macroblock decision algorithm (high quality mode)", OFFSET(mb_decision), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E, "mbd"}, {"simple", "use mbcmp (default)", 0, FF_OPT_TYPE_CONST, FF_MB_DECISION_SIMPLE, INT_MIN, INT_MAX, V|E, "mbd"}, {"bits", "use fewest bits", 0, FF_OPT_TYPE_CONST, FF_MB_DECISION_BITS, INT_MIN, INT_MAX, V|E, "mbd"}, {"rd", "use best rate distortion", 0, FF_OPT_TYPE_CONST, FF_MB_DECISION_RD, INT_MIN, INT_MAX, V|E, "mbd"},