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
6bca574a
Commit
6bca574a
authored
13 years ago
by
Carl Eugen Hoyos
Browse files
Options
Downloads
Patches
Plain Diff
Allow to overwrite input stream tags.
parent
02b651a7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
doc/ffmpeg.texi
+1
-1
1 addition, 1 deletion
doc/ffmpeg.texi
ffmpeg.c
+9
-0
9 additions, 0 deletions
ffmpeg.c
with
10 additions
and
1 deletion
doc/ffmpeg.texi
+
1
−
1
View file @
6bca574a
...
@@ -864,7 +864,7 @@ ffmpeg -i h264.mp4 -c:v copy -vbsf h264_mp4toannexb -an out.h264
...
@@ -864,7 +864,7 @@ ffmpeg -i h264.mp4 -c:v copy -vbsf h264_mp4toannexb -an out.h264
ffmpeg -i file.mov -an -vn -sbsf mov2textsub -c:s copy -f rawvideo sub.txt
ffmpeg -i file.mov -an -vn -sbsf mov2textsub -c:s copy -f rawvideo sub.txt
@end example
@end example
@item -tag[:@var
{
stream
_
specifier
}
] @var
{
codec
_
tag
}
(@emph
{
output,
per-stream
}
)
@item -tag[:@var
{
stream
_
specifier
}
] @var
{
codec
_
tag
}
(@emph
{
per-stream
}
)
Force a tag/fourcc for matching streams.
Force a tag/fourcc for matching streams.
@end table
@end table
...
...
This diff is collapsed.
Click to expand it.
ffmpeg.c
+
9
−
0
View file @
6bca574a
...
@@ -2988,6 +2988,7 @@ static AVCodec *choose_codec(OptionsContext *o, AVFormatContext *s, AVStream *st
...
@@ -2988,6 +2988,7 @@ static AVCodec *choose_codec(OptionsContext *o, AVFormatContext *s, AVStream *st
static
void
add_input_streams
(
OptionsContext
*
o
,
AVFormatContext
*
ic
)
static
void
add_input_streams
(
OptionsContext
*
o
,
AVFormatContext
*
ic
)
{
{
int
i
,
rfps
,
rfps_base
;
int
i
,
rfps
,
rfps_base
;
char
*
next
,
*
codec_tag
=
NULL
;
for
(
i
=
0
;
i
<
ic
->
nb_streams
;
i
++
)
{
for
(
i
=
0
;
i
<
ic
->
nb_streams
;
i
++
)
{
AVStream
*
st
=
ic
->
streams
[
i
];
AVStream
*
st
=
ic
->
streams
[
i
];
...
@@ -3005,6 +3006,14 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic)
...
@@ -3005,6 +3006,14 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic)
MATCH_PER_STREAM_OPT
(
ts_scale
,
dbl
,
scale
,
ic
,
st
);
MATCH_PER_STREAM_OPT
(
ts_scale
,
dbl
,
scale
,
ic
,
st
);
ist
->
ts_scale
=
scale
;
ist
->
ts_scale
=
scale
;
MATCH_PER_STREAM_OPT
(
codec_tags
,
str
,
codec_tag
,
ic
,
st
);
if
(
codec_tag
)
{
uint32_t
tag
=
strtol
(
codec_tag
,
&
next
,
0
);
if
(
*
next
)
tag
=
AV_RL32
(
codec_tag
);
st
->
codec
->
codec_tag
=
tag
;
}
ist
->
dec
=
choose_codec
(
o
,
ic
,
st
,
dec
->
codec_type
);
ist
->
dec
=
choose_codec
(
o
,
ic
,
st
,
dec
->
codec_type
);
if
(
!
ist
->
dec
)
if
(
!
ist
->
dec
)
ist
->
dec
=
avcodec_find_decoder
(
dec
->
codec_id
);
ist
->
dec
=
avcodec_find_decoder
(
dec
->
codec_id
);
...
...
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