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
47cd85e1
Commit
47cd85e1
authored
Jan 08, 2016
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat/mov: Simplify format checking code
Signed-off-by:
Michael Niedermayer
<
michael@niedermayer.cc
>
parent
6f1466dc
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
9 deletions
+2
-9
mov.c
libavformat/mov.c
+2
-9
No files found.
libavformat/mov.c
View file @
47cd85e1
...
...
@@ -1812,16 +1812,9 @@ static void mov_parse_stsd_audio(MOVContext *c, AVIOContext *pb,
AVStream
*
st
,
MOVStreamContext
*
sc
)
{
int
bits_per_sample
,
flags
;
uint32_t
format
;
uint16_t
version
;
uint16_t
version
=
avio_rb16
(
pb
);
AVDictionaryEntry
*
compatible_brands
=
av_dict_get
(
c
->
fc
->
metadata
,
"compatible_brands"
,
NULL
,
AV_DICT_MATCH_CASE
);
avio_seek
(
pb
,
-
12
,
SEEK_CUR
);
format
=
avio_rb32
(
pb
);
avio_seek
(
pb
,
8
,
SEEK_CUR
);
version
=
avio_rb16
(
pb
);
avio_rb16
(
pb
);
/* revision level */
avio_rb32
(
pb
);
/* vendor */
...
...
@@ -1870,7 +1863,7 @@ static void mov_parse_stsd_audio(MOVContext *c, AVIOContext *pb,
}
}
if
(
format
==
0
)
{
if
(
sc
->
format
==
0
)
{
if
(
st
->
codec
->
bits_per_coded_sample
==
8
)
st
->
codec
->
codec_id
=
mov_codec_id
(
st
,
MKTAG
(
'r'
,
'a'
,
'w'
,
' '
));
else
if
(
st
->
codec
->
bits_per_coded_sample
==
16
)
...
...
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