summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorPanagiotis Issaris <takis.issaris@uhasselt.be>2006-09-15 17:44:36 +0000
committerPanagiotis Issaris <takis.issaris@uhasselt.be>2006-09-15 17:44:36 +0000
commit7c272c0eb00bd9af3cf0eed3343b7a6b6e224477 (patch)
tree2314fc942e7a48b5a5196fc1d3bb2651380da451 /ffmpeg.c
parentbabe0e8cef52f96eed833a94249f4432055c06a5 (diff)
Remove the "preme" OptionDef option from ffmpeg.c
Originally committed as revision 6263 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 263ed020a4..a73269c4dd 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -142,7 +142,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 pre_me = 0;
static int do_deinterlace = 0;
static int workaround_bugs = FF_BUG_AUTODETECT;
static int packet_size = 0;
@@ -2373,11 +2372,6 @@ static void opt_b_frames(const char *arg)
}
}
-static void opt_pre_me(const char *arg)
-{
- pre_me = atoi(arg);
-}
-
static void opt_qscale(const char *arg)
{
video_qscale = atof(arg);
@@ -3044,8 +3038,6 @@ static void new_video_stream(AVFormatContext *oc)
if(inter_matrix)
video_enc->inter_matrix = inter_matrix;
- video_enc->pre_me = pre_me;
-
if (b_frames) {
video_enc->max_b_frames = b_frames;
video_enc->b_quant_factor = 2.0;
@@ -4028,7 +4020,6 @@ const OptionDef options[] = {
{ "me_threshold", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_me_threshold}, "motion estimaton threshold", "" },
{ "mb_threshold", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_mb_threshold}, "macroblock threshold", "" },
{ "bf", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_b_frames}, "use 'frames' B frames", "frames" },
- { "preme", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_pre_me}, "pre motion estimation", "" },
{ "bug", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_workaround_bugs}, "workaround not auto detected encoder bugs", "param" },
{ "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" },