[SCM] libav/experimental: Remove the "i_qoffset" OptionDef option from ffmpeg.c. The equally named "i_qoffset" AVOption takes over its function and this occurs transparantly.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit bcce83e693f32f6d260df6c33bad615506163449
Author: Panagiotis Issaris <takis.issaris at uhasselt.be>
Date:   Fri Sep 15 19:00:46 2006 +0000

    Remove the "i_qoffset" OptionDef option from ffmpeg.c. The equally named
    "i_qoffset" AVOption takes over its function and this occurs transparantly.
    
    Originally committed as revision 6271 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffmpeg.c b/ffmpeg.c
index d604a96..28308c5 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -128,7 +128,6 @@ static int video_rc_buffer_size=0;
 static float video_rc_buffer_aggressivity=1.0;
 static float video_rc_initial_cplx=0;
 static float video_i_qfactor = -0.8;
-static float video_i_qoffset = 0.0;
 static int me_method = ME_EPZS;
 static int video_disable = 0;
 static int video_discard = 0;
@@ -2454,10 +2453,6 @@ static void opt_i_qfactor(const char *arg)
 {
     video_i_qfactor = atof(arg);
 }
-static void opt_i_qoffset(const char *arg)
-{
-    video_i_qoffset = atof(arg);
-}
 
 static void opt_packet_size(const char *arg)
 {
@@ -3048,7 +3043,6 @@ static void new_video_stream(AVFormatContext *oc)
         video_enc->rc_buffer_aggressivity= video_rc_buffer_aggressivity;
         video_enc->rc_initial_cplx= video_rc_initial_cplx;
         video_enc->i_quant_factor = video_i_qfactor;
-        video_enc->i_quant_offset = video_i_qoffset;
         video_enc->me_threshold= me_threshold;
         video_enc->mb_threshold= mb_threshold;
         video_enc->intra_dc_precision= intra_dc_precision - 8;
@@ -3961,7 +3955,6 @@ const OptionDef options[] = {
     { "qsquish", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_qsquish}, "how to keep quantiser between qmin and qmax (0 = clip, 1 = use differentiable function)", "squish" },
     { "rc_init_cplx", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_rc_initial_cplx}, "initial complexity for 1-pass encoding", "complexity" },
     { "i_qfactor", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_i_qfactor}, "qp factor between p and i frames", "factor" },
-    { "i_qoffset", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_i_qoffset}, "qp offset between p and i frames", "offset" },
     { "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" },

-- 
Libav/FFmpeg packaging