Browse Source

ffmpeg: move creation_time for ffserver setting up

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.0
Michael Niedermayer 12 years ago
parent
commit
d7fbe926d3
1 changed files with 10 additions and 3 deletions
  1. +10
    -3
      ffmpeg_opt.c

+ 10
- 3
ffmpeg_opt.c View File

@@ -1509,9 +1509,6 @@ static int read_ffserver_streams(OptionsContext *o, AVFormatContext *s, const ch
choose_pixel_fmt(st, codec, st->codec->pix_fmt);
}

/* ffserver seeking with date=... needs a date reference */
err = parse_option(o, "metadata", "creation_time=now", options);

avformat_close_input(&ic);
return err;
}
@@ -1639,6 +1636,16 @@ static int open_output_file(OptionsContext *o, const char *filename)
}
}

/* ffserver seeking with date=... needs a date reference */
if (!strcmp(file_oformat->name, "ffm") &&
av_strstart(filename, "http:", NULL)) {
int err = parse_option(o, "metadata", "creation_time=now", options);
if (err < 0) {
print_error(filename, err);
exit_program(1);
}
}

if (!strcmp(file_oformat->name, "ffm") &&
av_strstart(filename, "http:", NULL)) {
int j;


Loading…
Cancel
Save