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
4bc7268f
Commit
4bc7268f
authored
Feb 16, 2017
by
Thierry Foucu
Committed by
Carl Eugen Hoyos
Feb 17, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf/riff: Support decoding files with broken mediasubtype base guid.
Fixes ticket #6100.
parent
04e61147
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
0 deletions
+4
-0
riff.h
libavformat/riff.h
+2
-0
riffdec.c
libavformat/riffdec.c
+2
-0
No files found.
libavformat/riff.h
View file @
4bc7268f
...
...
@@ -109,6 +109,8 @@ extern const AVCodecGuid ff_codec_wav_guids[];
0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71
#define FF_AMBISONIC_BASE_GUID \
0x21, 0x07, 0xD3, 0x11, 0x86, 0x44, 0xC8, 0xC1, 0xCA, 0x00, 0x00, 0x00
#define FF_BROKEN_BASE_GUID \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0xAA
static
av_always_inline
int
ff_guidcmp
(
const
void
*
g1
,
const
void
*
g2
)
{
...
...
libavformat/riffdec.c
View file @
4bc7268f
...
...
@@ -71,6 +71,8 @@ static void parse_waveformatex(AVIOContext *pb, AVCodecParameters *par)
ff_get_guid
(
pb
,
&
subformat
);
if
(
!
memcmp
(
subformat
+
4
,
(
const
uint8_t
[]){
FF_AMBISONIC_BASE_GUID
},
12
)
||
!
memcmp
(
subformat
+
4
,
(
const
uint8_t
[]){
FF_BROKEN_BASE_GUID
},
12
)
||
!
memcmp
(
subformat
+
4
,
(
const
uint8_t
[]){
FF_MEDIASUBTYPE_BASE_GUID
},
12
))
{
par
->
codec_tag
=
AV_RL32
(
subformat
);
...
...
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