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
9860fb44
Commit
9860fb44
authored
Oct 18, 2013
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix decoding of G.726 in AIFF.
Fixes ticket #1973.
parent
6e65e348
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
aiff.h
libavformat/aiff.h
+1
-1
aiffdec.c
libavformat/aiffdec.c
+2
-0
No files found.
libavformat/aiff.h
View file @
9860fb44
...
@@ -46,7 +46,7 @@ static const AVCodecTag ff_codec_aiff_tags[] = {
...
@@ -46,7 +46,7 @@ static const AVCodecTag ff_codec_aiff_tags[] = {
{
AV_CODEC_ID_MACE6
,
MKTAG
(
'M'
,
'A'
,
'C'
,
'6'
)
},
{
AV_CODEC_ID_MACE6
,
MKTAG
(
'M'
,
'A'
,
'C'
,
'6'
)
},
{
AV_CODEC_ID_GSM
,
MKTAG
(
'G'
,
'S'
,
'M'
,
' '
)
},
{
AV_CODEC_ID_GSM
,
MKTAG
(
'G'
,
'S'
,
'M'
,
' '
)
},
{
AV_CODEC_ID_ADPCM_G722
,
MKTAG
(
'G'
,
'7'
,
'2'
,
'2'
)
},
{
AV_CODEC_ID_ADPCM_G722
,
MKTAG
(
'G'
,
'7'
,
'2'
,
'2'
)
},
{
AV_CODEC_ID_ADPCM_G726
,
MKTAG
(
'G'
,
'7'
,
'2'
,
'6'
)
},
{
AV_CODEC_ID_ADPCM_G726
LE
,
MKTAG
(
'G'
,
'7'
,
'2'
,
'6'
)
},
{
AV_CODEC_ID_PCM_S16BE
,
MKTAG
(
't'
,
'w'
,
'o'
,
's'
)
},
{
AV_CODEC_ID_PCM_S16BE
,
MKTAG
(
't'
,
'w'
,
'o'
,
's'
)
},
{
AV_CODEC_ID_PCM_S16LE
,
MKTAG
(
's'
,
'o'
,
'w'
,
't'
)
},
{
AV_CODEC_ID_PCM_S16LE
,
MKTAG
(
's'
,
'o'
,
'w'
,
't'
)
},
{
AV_CODEC_ID_ADPCM_IMA_QT
,
MKTAG
(
'i'
,
'm'
,
'a'
,
'4'
)
},
{
AV_CODEC_ID_ADPCM_IMA_QT
,
MKTAG
(
'i'
,
'm'
,
'a'
,
'4'
)
},
...
...
libavformat/aiffdec.c
View file @
9860fb44
...
@@ -141,6 +141,8 @@ static unsigned int get_aiff_header(AVFormatContext *s, int size,
...
@@ -141,6 +141,8 @@ static unsigned int get_aiff_header(AVFormatContext *s, int size,
case
AV_CODEC_ID_MACE3
:
case
AV_CODEC_ID_MACE3
:
codec
->
block_align
=
2
*
codec
->
channels
;
codec
->
block_align
=
2
*
codec
->
channels
;
break
;
break
;
case
AV_CODEC_ID_ADPCM_G726LE
:
codec
->
bits_per_coded_sample
=
5
;
case
AV_CODEC_ID_ADPCM_G722
:
case
AV_CODEC_ID_ADPCM_G722
:
case
AV_CODEC_ID_MACE6
:
case
AV_CODEC_ID_MACE6
:
codec
->
block_align
=
1
*
codec
->
channels
;
codec
->
block_align
=
1
*
codec
->
channels
;
...
...
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