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
a765ba64
Commit
a765ba64
authored
Nov 08, 2016
by
Vittorio Giovara
Committed by
Michael Niedermayer
Nov 08, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat/mov: Read multiple stsd from DV
Signed-off-by:
Michael Niedermayer
<
michael@niedermayer.cc
>
parent
6f0a1710
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
0 deletions
+2
-0
mov.c
libavformat/mov.c
+2
-0
No files found.
libavformat/mov.c
View file @
a765ba64
...
...
@@ -2213,6 +2213,8 @@ static int mov_skip_multiple_stsd(MOVContext *c, AVIOContext *pb,
(
codec_tag
!=
format
&&
// prores is allowed to have differing data format and codec tag
codec_tag
!=
AV_RL32
(
"apcn"
)
&&
codec_tag
!=
AV_RL32
(
"apch"
)
&&
// so is dv (sigh)
codec_tag
!=
AV_RL32
(
"dvpp"
)
&&
codec_tag
!=
AV_RL32
(
"dvcp"
)
&&
(
c
->
fc
->
video_codec_id
?
video_codec_id
!=
c
->
fc
->
video_codec_id
:
codec_tag
!=
MKTAG
(
'j'
,
'p'
,
'e'
,
'g'
))))
{
/* Multiple fourcc, we skip JPEG. This is not correct, we should
...
...
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