Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
100c3fb2
Commit
100c3fb2
authored
Mar 08, 2012
by
Alex Converse
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mpegts: Always honor a registration descriptor if present and there is no other codec information.
parent
744dd1d3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
2 deletions
+1
-2
mpegts.c
libavformat/mpegts.c
+1
-2
No files found.
libavformat/mpegts.c
View file @
100c3fb2
...
...
@@ -1349,8 +1349,7 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type
case
0x05
:
/* registration descriptor */
st
->
codec
->
codec_tag
=
bytestream_get_le32
(
pp
);
av_dlog
(
fc
,
"reg_desc=%.4s
\n
"
,
(
char
*
)
&
st
->
codec
->
codec_tag
);
if
(
st
->
codec
->
codec_id
==
CODEC_ID_NONE
&&
stream_type
==
STREAM_TYPE_PRIVATE_DATA
)
if
(
st
->
codec
->
codec_id
==
CODEC_ID_NONE
)
mpegts_find_stream_type
(
st
,
st
->
codec
->
codec_tag
,
REGD_types
);
break
;
default:
...
...
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