Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
d7fbe926
Commit
d7fbe926
authored
11 years ago
by
Michael Niedermayer
Browse files
Options
Downloads
Patches
Plain Diff
ffmpeg: move creation_time for ffserver setting up
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
a03e79ed
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
ffmpeg_opt.c
+10
-3
10 additions, 3 deletions
ffmpeg_opt.c
with
10 additions
and
3 deletions
ffmpeg_opt.c
+
10
−
3
View file @
d7fbe926
...
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment