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

ffmpeg: move creation_time for ffserver setting up

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-07-09 01:40:11 +02:00
parent a03e79ed5a
commit d7fbe926d3
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
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); 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); avformat_close_input(&ic);
return err; 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") && if (!strcmp(file_oformat->name, "ffm") &&
av_strstart(filename, "http:", NULL)) { av_strstart(filename, "http:", NULL)) {
int j; int j;