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
d5edb6c0
Commit
d5edb6c0
authored
Jul 03, 2016
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf/aiffdec: Support QDMC demuxing.
parent
37941878
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
aiff.h
libavformat/aiff.h
+1
-0
aiffdec.c
libavformat/aiffdec.c
+2
-1
No files found.
libavformat/aiff.h
View file @
d5edb6c0
...
...
@@ -50,6 +50,7 @@ static const AVCodecTag ff_codec_aiff_tags[] = {
{
AV_CODEC_ID_PCM_S16BE
,
MKTAG
(
't'
,
'w'
,
'o'
,
's'
)
},
{
AV_CODEC_ID_PCM_S16LE
,
MKTAG
(
's'
,
'o'
,
'w'
,
't'
)
},
{
AV_CODEC_ID_ADPCM_IMA_QT
,
MKTAG
(
'i'
,
'm'
,
'a'
,
'4'
)
},
{
AV_CODEC_ID_QDMC
,
MKTAG
(
'Q'
,
'D'
,
'M'
,
'C'
)
},
{
AV_CODEC_ID_QDM2
,
MKTAG
(
'Q'
,
'D'
,
'M'
,
'2'
)
},
{
AV_CODEC_ID_QCELP
,
MKTAG
(
'Q'
,
'c'
,
'l'
,
'p'
)
},
{
AV_CODEC_ID_SDX2_DPCM
,
MKTAG
(
'S'
,
'D'
,
'X'
,
'2'
)
},
...
...
libavformat/aiffdec.c
View file @
d5edb6c0
...
...
@@ -301,7 +301,8 @@ static int aiff_read_header(AVFormatContext *s)
return
-
1
;
if
(
ff_get_extradata
(
s
,
st
->
codecpar
,
pb
,
size
)
<
0
)
return
AVERROR
(
ENOMEM
);
if
(
st
->
codecpar
->
codec_id
==
AV_CODEC_ID_QDM2
&&
size
>=
12
*
4
&&
!
st
->
codecpar
->
block_align
)
{
if
(
(
st
->
codecpar
->
codec_id
==
AV_CODEC_ID_QDMC
||
st
->
codecpar
->
codec_id
==
AV_CODEC_ID_QDM2
)
&&
size
>=
12
*
4
&&
!
st
->
codecpar
->
block_align
)
{
st
->
codecpar
->
block_align
=
AV_RB32
(
st
->
codecpar
->
extradata
+
11
*
4
);
aiff
->
block_duration
=
AV_RB32
(
st
->
codecpar
->
extradata
+
9
*
4
);
}
else
if
(
st
->
codecpar
->
codec_id
==
AV_CODEC_ID_QCELP
)
{
...
...
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