[SCM] libav/experimental: Remove the "rc_init_cplx" OptionDef option from ffmpeg.c. The equally named "rc_init_cplx" 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 469b7bf86802def50b7057cfa346e633c43ae3f6
Author: Panagiotis Issaris <takis.issaris at uhasselt.be>
Date:   Fri Sep 15 23:04:55 2006 +0000

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

diff --git a/ffmpeg.c b/ffmpeg.c
index f15d4d5..f348b50 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -125,7 +125,6 @@ static char *video_rc_override_string=NULL;
 static char *video_rc_eq="tex^qComp";
 static int video_rc_buffer_size=0;
 static float video_rc_buffer_aggressivity=1.0;
-static float video_rc_initial_cplx=0;
 static int me_method = ME_EPZS;
 static int video_disable = 0;
 static int video_discard = 0;
@@ -2437,11 +2436,6 @@ static void opt_qdiff(const char *arg)
     }
 }
 
-static void opt_rc_initial_cplx(const char *arg)
-{
-    video_rc_initial_cplx = atof(arg);
-}
-
 static void opt_packet_size(const char *arg)
 {
     packet_size= atoi(arg);
@@ -3023,7 +3017,6 @@ static void new_video_stream(AVFormatContext *oc)
         video_enc->rc_buffer_size = video_rc_buffer_size;
         video_enc->rc_initial_buffer_occupancy = video_rc_buffer_size*3/4;
         video_enc->rc_buffer_aggressivity= video_rc_buffer_aggressivity;
-        video_enc->rc_initial_cplx= video_rc_initial_cplx;
         video_enc->me_threshold= me_threshold;
         video_enc->mb_threshold= mb_threshold;
         video_enc->intra_dc_precision= intra_dc_precision - 8;
@@ -3933,7 +3926,6 @@ const OptionDef options[] = {
     { "mblmax", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_mb_lmax}, "max macroblock quantiser scale (VBR)", "q" },
     { "qdiff", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_qdiff}, "max difference between the quantiser scale (VBR)", "q" },
     { "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" },
     { "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" },
     { "bufsize", HAS_ARG | OPT_VIDEO, {(void*)opt_video_buffer_size}, "set ratecontrol buffer size (in kByte)", "size" },

-- 
Libav/FFmpeg packaging