Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
4f40d64e
Commit
4f40d64e
authored
Feb 23, 2018
by
Aman Gupta
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat/mpegts: set AV_DISPOSITION_DEPENDENT for mix_type=0 supplementary audio
Signed-off-by:
Aman Gupta
<
aman@tmm1.net
>
parent
61ecfbc3
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
0 deletions
+7
-0
ffmpeg.c
fftools/ffmpeg.c
+1
-0
avformat.h
libavformat/avformat.h
+1
-0
dump.c
libavformat/dump.c
+2
-0
mpegts.c
libavformat/mpegts.c
+3
-0
No files found.
fftools/ffmpeg.c
View file @
4f40d64e
...
...
@@ -3592,6 +3592,7 @@ static int init_output_stream(OutputStream *ost, char *error, int error_len)
{
"clean_effects"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{
.
i64
=
AV_DISPOSITION_CLEAN_EFFECTS
},
.
unit
=
"flags"
},
{
"captions"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{
.
i64
=
AV_DISPOSITION_CAPTIONS
},
.
unit
=
"flags"
},
{
"descriptions"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{
.
i64
=
AV_DISPOSITION_DESCRIPTIONS
},
.
unit
=
"flags"
},
{
"dependent"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{
.
i64
=
AV_DISPOSITION_DEPENDENT
},
.
unit
=
"flags"
},
{
"metadata"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{
.
i64
=
AV_DISPOSITION_METADATA
},
.
unit
=
"flags"
},
{
NULL
},
};
...
...
libavformat/avformat.h
View file @
4f40d64e
...
...
@@ -845,6 +845,7 @@ typedef struct AVStreamInternal AVStreamInternal;
#define AV_DISPOSITION_CAPTIONS 0x10000
#define AV_DISPOSITION_DESCRIPTIONS 0x20000
#define AV_DISPOSITION_METADATA 0x40000
#define AV_DISPOSITION_DEPENDENT 0x80000 ///< dependent audio stream (mix_type=0 in mpegts)
/**
* Options for behavior on timestamp wrap detection.
...
...
libavformat/dump.c
View file @
4f40d64e
...
...
@@ -549,6 +549,8 @@ static void dump_stream_format(AVFormatContext *ic, int i,
av_log
(
NULL
,
AV_LOG_INFO
,
" (clean effects)"
);
if
(
st
->
disposition
&
AV_DISPOSITION_DESCRIPTIONS
)
av_log
(
NULL
,
AV_LOG_INFO
,
" (descriptions)"
);
if
(
st
->
disposition
&
AV_DISPOSITION_DEPENDENT
)
av_log
(
NULL
,
AV_LOG_INFO
,
" (dependent)"
);
av_log
(
NULL
,
AV_LOG_INFO
,
"
\n
"
);
dump_metadata
(
NULL
,
st
->
metadata
,
" "
);
...
...
libavformat/mpegts.c
View file @
4f40d64e
...
...
@@ -1904,6 +1904,9 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type
return
AVERROR_INVALIDDATA
;
flags
=
get8
(
pp
,
desc_end
);
if
((
flags
&
0x80
)
==
0
)
/* mix_type */
st
->
disposition
|=
AV_DISPOSITION_DEPENDENT
;
switch
((
flags
>>
2
)
&
0x1F
)
{
/* editorial_classification */
case
0x01
:
st
->
disposition
|=
AV_DISPOSITION_VISUAL_IMPAIRED
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment