aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2004-04-25 02:09:47 +0000
committerMichael Niedermayer <michaelni@gmx.at>2004-04-25 02:09:47 +0000
commitf20f8a8b0b666be498ac50be21c6f5485e083498 (patch)
treee1d8e6f0a1eae9f8075cd94efd72971116e8d268 /ffmpeg.c
parent7e56cd927b5842fa74ec8b5fddf6ac2b6a40145c (diff)
downloadffmpeg-f20f8a8b0b666be498ac50be21c6f5485e083498.tar.gz
support reusing mb types and field select values of the source file, but use motion vectors just as additional predictors
minor cleanup segfault fix Originally committed as revision 3060 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index a385c1056a..0b89018645 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -161,6 +161,7 @@ static int sc_threshold = 0;
static int debug = 0;
static int debug_mv = 0;
static int me_threshold = 0;
+static int mb_threshold = 0;
extern int loop_input; /* currently a hack */
static int gop_size = 12;
@@ -1866,6 +1867,10 @@ static void opt_me_threshold(const char *arg)
me_threshold = atoi(arg);
}
+static void opt_mb_threshold(const char *arg)
+{
+ mb_threshold = atoi(arg);
+}
static void opt_error_resilience(const char *arg)
{
@@ -2873,6 +2878,7 @@ static void opt_output_file(const char *filename)
video_enc->dct_algo = dct_algo;
video_enc->idct_algo = idct_algo;
video_enc->me_threshold= me_threshold;
+ video_enc->mb_threshold= mb_threshold;
video_enc->strict_std_compliance = strict;
video_enc->error_rate = error_rate;
video_enc->noise_reduction= noise_reduction;
@@ -3494,6 +3500,7 @@ const OptionDef options[] = {
{ "dct_algo", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_dct_algo}, "set dct algo", "algo" },
{ "idct_algo", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_idct_algo}, "set idct algo", "algo" },
{ "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", "" },
{ "er", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_error_resilience}, "set error resilience", "n" },
{ "ec", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_error_concealment}, "set error concealment", "bit_mask" },
{ "bf", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_b_frames}, "use 'frames' B frames", "frames" },