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
afaa39b4
Commit
afaa39b4
authored
May 21, 2014
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't overwrite codec_id with 0 in ff_mp4_read_dec_config_descr().
Fixes ticket #3660.
parent
ce4d91ba
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
isom.c
libavformat/isom.c
+4
-1
No files found.
libavformat/isom.c
View file @
afaa39b4
...
...
@@ -441,6 +441,7 @@ static const AVCodecTag mp4_audio_types[] = {
int
ff_mp4_read_dec_config_descr
(
AVFormatContext
*
fc
,
AVStream
*
st
,
AVIOContext
*
pb
)
{
enum
AVCodecID
codec_id
;
int
len
,
tag
;
int
ret
;
int
object_type_id
=
avio_r8
(
pb
);
...
...
@@ -454,7 +455,9 @@ int ff_mp4_read_dec_config_descr(AVFormatContext *fc, AVStream *st, AVIOContext
return
-
1
;
}
st
->
codec
->
codec_id
=
ff_codec_get_id
(
ff_mp4_obj_type
,
object_type_id
);
codec_id
=
ff_codec_get_id
(
ff_mp4_obj_type
,
object_type_id
);
if
(
codec_id
)
st
->
codec
->
codec_id
=
codec_id
;
av_dlog
(
fc
,
"esds object type id 0x%02x
\n
"
,
object_type_id
);
len
=
ff_mp4_read_descr
(
fc
,
pb
,
&
tag
);
if
(
tag
==
MP4DecSpecificDescrTag
)
{
...
...
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