generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ffmpeg_opt: Remove support for specifying -t anywhere to set the duration

Browse Source 
This would otherwise conflict with the semantics of using -t for the input

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-08-06 11:58:40 +02:00
parent 7cbef2ed7e
commit 6d77279ed8
1 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ffmpeg_opt.c
View File

@ -95,9 +95,7 @@ static int do_psnr = 0;
static int input_sync; static int input_sync;
static int override_ffserver = 0; static int override_ffserver = 0;
static int64_t recording_time = INT64_MAX; static void uninit_options(OptionsContext *o)
static void uninit_options(OptionsContext *o, int is_input)
{ {
const OptionDef *po = options; const OptionDef *po = options;
int i; int i;
@ -127,27 +125,16 @@ static void uninit_options(OptionsContext *o, int is_input)
av_freep(&o->audio_channel_maps); av_freep(&o->audio_channel_maps);
av_freep(&o->streamid_map); av_freep(&o->streamid_map);
av_freep(&o->attachments); av_freep(&o->attachments);
if (is_input)
recording_time = o->recording_time;
else
recording_time = INT64_MAX;
} }
static void init_options(OptionsContext *o, int is_input) static void init_options(OptionsContext *o)
{ {
memset(o, 0, sizeof(*o)); memset(o, 0, sizeof(*o));
if (!is_input && recording_time != INT64_MAX) {
o->recording_time = recording_time;
av_log(NULL, AV_LOG_WARNING,
"-t is not an input option, keeping it for the next output;"
" consider fixing your command line.\n");
} else
o->recording_time = INT64_MAX;
o->stop_time = INT64_MAX; o->stop_time = INT64_MAX;
o->mux_max_delay = 0.7; o->mux_max_delay = 0.7;
o->start_time = AV_NOPTS_VALUE; o->start_time = AV_NOPTS_VALUE;
o->recording_time = INT64_MAX;
o->limit_filesize = UINT64_MAX; o->limit_filesize = UINT64_MAX;
o->chapters_input_file = INT_MAX; o->chapters_input_file = INT_MAX;
o->accurate_seek = 1; o->accurate_seek = 1;
@ -2492,7 +2479,7 @@ static int open_files(OptionGroupList *l, const char *inout,
OptionGroup *g = &l->groups[i]; OptionGroup *g = &l->groups[i];
OptionsContext o; OptionsContext o;
init_options(&o, !strcmp(inout, "input")); init_options(&o);
o.g = g; o.g = g;
ret = parse_optgroup(&o, g); ret = parse_optgroup(&o, g);
@ -2504,7 +2491,7 @@ static int open_files(OptionGroupList *l, const char *inout,
av_log(NULL, AV_LOG_DEBUG, "Opening an %s file: %s.\n", inout, g->arg); av_log(NULL, AV_LOG_DEBUG, "Opening an %s file: %s.\n", inout, g->arg);
ret = open_file(&o, g->arg); ret = open_file(&o, g->arg);
uninit_options(&o, !strcmp(inout, "input")); uninit_options(&o);
if (ret < 0) { if (ret < 0) {
av_log(NULL, AV_LOG_ERROR, "Error opening %s file %s.\n", av_log(NULL, AV_LOG_ERROR, "Error opening %s file %s.\n",
inout, g->arg); inout, g->arg);
@ -2612,7 +2599,7 @@ const OptionDef options[] = {
{ "map_chapters", HAS_ARG | OPT_INT | OPT_EXPERT | OPT_OFFSET | { "map_chapters", HAS_ARG | OPT_INT | OPT_EXPERT | OPT_OFFSET |
OPT_OUTPUT, { .off = OFFSET(chapters_input_file) }, OPT_OUTPUT, { .off = OFFSET(chapters_input_file) },
"set chapters mapping", "input_file_index" }, "set chapters mapping", "input_file_index" },
{ "t", HAS_ARG | OPT_TIME | OPT_OFFSET | OPT_INPUT | OPT_OUTPUT, { .off = OFFSET(recording_time) }, { "t", HAS_ARG | OPT_TIME | OPT_OFFSET | OPT_OUTPUT, { .off = OFFSET(recording_time) },
"record or transcode \"duration\" seconds of audio/video", "record or transcode \"duration\" seconds of audio/video",
"duration" }, "duration" },
{ "to", HAS_ARG | OPT_TIME | OPT_OFFSET | OPT_OUTPUT, { .off = OFFSET(stop_time) }, { "to", HAS_ARG | OPT_TIME | OPT_OFFSET | OPT_OUTPUT, { .off = OFFSET(stop_time) },