summaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2002-09-12 16:41:05 +0000
committerMichael Niedermayer <michaelni@gmx.at>2002-09-12 16:41:05 +0000
commit8409b8fe74e8e13d28dd84a144a856081647b275 (patch)
treeed1b5e3ac4bd93ff293b5659ea7016042ef89010 /ffmpeg.c
parentf3cfadd52f0b99b22db76a2875f6b1e55220c143 (diff)
downloadffmpeg-streaming-8409b8fe74e8e13d28dd84a144a856081647b275.zip
ffmpeg-streaming-8409b8fe74e8e13d28dd84a144a856081647b275.tar.gz
error resilience command line option
Originally committed as revision 932 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 6f8c667..b64655c 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -115,6 +115,7 @@ static int use_hq = 0;
static int use_4mv = 0;
static int do_deinterlace = 0;
static int workaround_bugs = 0;
+static int error_resilience = 0;
static int dct_algo = 0;
static int gop_size = 12;
@@ -1030,6 +1031,7 @@ static int av_encode(AVFormatContext **output_files,
case CODEC_TYPE_VIDEO:
if (ist->st->codec.codec_id == CODEC_ID_RAWVIDEO) {
int size;
+
size = (ist->st->codec.width * ist->st->codec.height);
avpicture_fill(&picture, ptr,
ist->st->codec.pix_fmt,
@@ -1383,6 +1385,11 @@ void opt_dct_algo(const char *arg)
dct_algo = atoi(arg);
}
+void opt_error_resilience(const char *arg)
+{
+ error_resilience = atoi(arg);
+}
+
void opt_frame_rate(const char *arg)
{
frame_rate = (int)(strtod(arg, 0) * FRAME_RATE_BASE);
@@ -1713,6 +1720,7 @@ void opt_input_file(const char *filename)
frame_width = enc->width;
rfps = ic->streams[i]->r_frame_rate;
enc->workaround_bugs = workaround_bugs;
+ enc->error_resilience = error_resilience;
if (enc->frame_rate != rfps) {
fprintf(stderr,"\nSeems that stream %d comes from film source: %2.2f->%2.2f\n",
i, (float)enc->frame_rate / FRAME_RATE_BASE,
@@ -2236,6 +2244,7 @@ const OptionDef options[] = {
{ "me", HAS_ARG | OPT_EXPERT, {(void*)opt_motion_estimation}, "set motion estimation method",
"method" },
{ "dct_algo", HAS_ARG | OPT_EXPERT, {(void*)opt_dct_algo}, "set dct algo", "algo" },
+ { "er", HAS_ARG | OPT_EXPERT, {(void*)opt_error_resilience}, "set error resilience", "" },
{ "bf", HAS_ARG | OPT_EXPERT, {(void*)opt_b_frames}, "use 'frames' B frames (only MPEG-4)", "frames" },
{ "hq", OPT_BOOL | OPT_EXPERT, {(void*)&use_hq}, "activate high quality settings" },
{ "4mv", OPT_BOOL | OPT_EXPERT, {(void*)&use_4mv}, "use four motion vector by macroblock (only MPEG-4)" },
OpenPOWER on IntegriCloud