[SCM] libav/experimental: 10l (didnt remove option from old ones after converting to AVOption)

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit c9ab8df88a51821ceec673e74437817a937cb708
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sun Dec 25 17:43:52 2005 +0000

    10l (didnt remove option from old ones after converting to AVOption)
    
    Originally committed as revision 4775 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffmpeg.c b/ffmpeg.c
index 788d748..3bcfd75 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -143,7 +143,6 @@ static int video_codec_id = CODEC_ID_NONE;
 static int video_codec_tag = 0;
 static int same_quality = 0;
 static int b_frames = 0;
-static int b_strategy = 0;
 static int pre_me = 0;
 static int do_deinterlace = 0;
 static int workaround_bugs = FF_BUG_AUTODETECT;
@@ -3157,7 +3156,6 @@ static void new_video_stream(AVFormatContext *oc)
 
         if (b_frames) {
             video_enc->max_b_frames = b_frames;
-            video_enc->b_frame_strategy = b_strategy;
             video_enc->b_quant_factor = 2.0;
         }
         video_enc->qmin = video_qmin;
@@ -4067,7 +4065,6 @@ const OptionDef options[] = {
     { "i_qoffset", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_i_qoffset}, "qp offset between p and i frames", "offset" },
     { "ibias", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_ibias}, "intra quant bias", "bias" },
     { "pbias", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_pbias}, "inter quant bias", "bias" },
-    { "b_strategy", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&b_strategy}, "dynamic b frame selection strategy", "strategy" },
     { "rc_eq", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_video_rc_eq}, "set rate control equation", "equation" },
     { "rc_override", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_video_rc_override_string}, "rate control override for specific intervals", "override" },
     { "bt", HAS_ARG | OPT_VIDEO, {(void*)opt_video_bitrate_tolerance}, "set video bitrate tolerance (in kbit/s)", "tolerance" },
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 0c51d96..a0e97ca 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -506,7 +506,7 @@ static AVOption options[]={
 {"max_b_frames", NULL, OFFSET(max_b_frames), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E},
 {"b_quant_factor", NULL, OFFSET(b_quant_factor), FF_OPT_TYPE_FLOAT, DEFAULT, FLT_MIN, FLT_MAX, V|E},
 {"rc_strategy", NULL, OFFSET(rc_strategy), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E},
-{"b_frame_strategy", NULL, OFFSET(b_frame_strategy), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E},
+{"b_strategy", NULL, OFFSET(b_frame_strategy), FF_OPT_TYPE_INT, 0, INT_MIN, INT_MAX, V|E},
 {"hurry_up", NULL, OFFSET(hurry_up), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|D},
 {"rtp_mode", NULL, OFFSET(rtp_mode), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX},
 {"rtp_payload_size", NULL, OFFSET(rtp_payload_size), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX},

-- 
Libav/FFmpeg packaging