Remove the "error" OptionDef. The equally named AVOption takes over its

function.

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@6322 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/ffmpeg.c b/ffmpeg.c
index 03e223ed8441fc8a0ee99f3b0c9444549d1960b0..d2a169b1a7460f36223856aa75b0ef5b9587ddc6 100644 (file)
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -129,7 +129,6 @@ static int video_codec_tag = 0;
 static int same_quality = 0;
 static int do_deinterlace = 0;
 static int packet_size = 0;
-static int error_rate = 0;
 static int strict = 0;
 static int top_field_first = -1;
 static int me_threshold = 0;
@@ -2366,11 +2365,6 @@ static void opt_packet_size(const char *arg)
     packet_size= atoi(arg);
 }
 
-static void opt_error_rate(const char *arg)
-{
-    error_rate= atoi(arg);
-}
-
 static void opt_strict(const char *arg)
 {
     strict= atoi(arg);
@@ -2931,7 +2925,6 @@ static void new_video_stream(AVFormatContext *oc)
         video_enc->me_threshold= me_threshold;
         video_enc->intra_dc_precision= intra_dc_precision - 8;
         video_enc->strict_std_compliance = strict;
-        video_enc->error_rate = error_rate;
 
         if(packet_size){
             video_enc->rtp_mode= 1;
@@ -3833,7 +3826,6 @@ const OptionDef options[] = {
       "method" },
     { "me_threshold", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_me_threshold}, "motion estimaton threshold",  "" },
     { "ps", HAS_ARG | OPT_EXPERT, {(void*)opt_packet_size}, "set packet size in bits", "size" },
-    { "error", HAS_ARG | OPT_EXPERT, {(void*)opt_error_rate}, "error rate", "rate" },
     { "strict", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_strict}, "how strictly to follow the standards", "strictness" },
     { "sameq", OPT_BOOL | OPT_VIDEO, {(void*)&same_quality},
       "use same video quality as source (implies VBR)" },

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index aecad47bdfd29121932dfbf6f4a05aaee05ae2b9..90880af01c1599f419ffc00e4ae1e9a869e7508c 100644 (file)
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -686,7 +686,7 @@ static const AVOption options[]={
 {"rc_init_occupancy", NULL, OFFSET(rc_initial_buffer_occupancy), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E},
 {"inter_threshold", NULL, OFFSET(inter_threshold), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E},
 {"flags2", NULL, OFFSET(flags2), FF_OPT_TYPE_FLAGS, CODEC_FLAG2_FASTPSKIP, INT_MIN, INT_MAX, V|A|E|D, "flags2"},
-{"error", NULL, OFFSET(error_rate), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX},
+{"error", NULL, OFFSET(error_rate), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E},
 {"antialias", NULL, OFFSET(antialias_algo), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|D, "aa"},
 {"auto", NULL, 0, FF_OPT_TYPE_CONST, FF_AA_AUTO, INT_MIN, INT_MAX, V|D, "aa"},
 {"fastint", NULL, 0, FF_OPT_TYPE_CONST, FF_AA_FASTINT, INT_MIN, INT_MAX, V|D, "aa"},