summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorPanagiotis Issaris <takis.issaris@uhasselt.be>2006-09-22 15:04:56 +0000
committerPanagiotis Issaris <takis.issaris@uhasselt.be>2006-09-22 15:04:56 +0000
commitcccb4c966ba9b2a9239697830e9b21d1f4293348 (patch)
treef8667ef460a7e2ba60f1f373ee68fde3cfefe0df /ffmpeg.c
parentf4ea01dcd126a98202217e0d9d1ff700169d9144 (diff)
Remove the "mepc" OptionDef. The equally named AVOption takes over its function.
Originally committed as revision 6321 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index c2fceb81ef..03e223ed84 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -134,7 +134,6 @@ static int strict = 0;
static int top_field_first = -1;
static int me_threshold = 0;
static int intra_dc_precision = 8;
-static int me_penalty_compensation= 256;
static int loop_input = 0;
static int loop_output = AVFMT_NOOUTPUTLOOP;
static int qp_hist = 0;
@@ -2933,7 +2932,6 @@ static void new_video_stream(AVFormatContext *oc)
video_enc->intra_dc_precision= intra_dc_precision - 8;
video_enc->strict_std_compliance = strict;
video_enc->error_rate = error_rate;
- video_enc->me_penalty_compensation= me_penalty_compensation;
if(packet_size){
video_enc->rtp_mode= 1;
@@ -3850,7 +3848,6 @@ const OptionDef options[] = {
{ "inter_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_inter_matrix}, "specify inter matrix coeffs", "matrix" },
{ "top", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_top_field_first}, "top=1/bottom=0/auto=-1 field first", "" },
{ "dc", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)&intra_dc_precision}, "intra_dc_precision", "precision" },
- { "mepc", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)&me_penalty_compensation}, "motion estimation bitrate penalty compensation", "factor (1.0 = 256)" },
{ "vtag", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_video_tag}, "force video tag/fourcc", "fourcc/tag" },
{ "newvideo", OPT_VIDEO, {(void*)opt_new_video_stream}, "add a new video stream to the current output stream" },
{ "qphist", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, { (void *)&qp_hist }, "show QP histogram" },