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
388a6f58
Commit
388a6f58
authored
Jun 23, 2015
by
Rodger Combs
Committed by
Michael Niedermayer
Jun 25, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc+doc: adjust names to reflect ADPCM THP not being GameCube-only
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
0643b4bf
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
general.texi
doc/general.texi
+1
-1
adpcm.c
libavcodec/adpcm.c
+2
-2
codec_desc.c
libavcodec/codec_desc.c
+2
-2
No files found.
doc/general.texi
View file @
388a6f58
...
@@ -880,7 +880,7 @@ following image formats are supported:
...
@@ -880,7 +880,7 @@ following image formats are supported:
@item ADPCM MS IMA @tab X @tab X
@item ADPCM MS IMA @tab X @tab X
@item ADPCM Nintendo Gamecube AFC @tab @tab X
@item ADPCM Nintendo Gamecube AFC @tab @tab X
@item ADPCM Nintendo Gamecube DTK @tab @tab X
@item ADPCM Nintendo Gamecube DTK @tab @tab X
@item ADPCM Nintendo
Gamecube
THP @tab @tab X
@item ADPCM Nintendo THP @tab @tab X
@item ADPCM QT IMA @tab X @tab X
@item ADPCM QT IMA @tab X @tab X
@item ADPCM SEGA CRI ADX @tab X @tab X
@item ADPCM SEGA CRI ADX @tab X @tab X
@tab Used in Sega Dreamcast games.
@tab Used in Sega Dreamcast games.
...
...
libavcodec/adpcm.c
View file @
388a6f58
...
@@ -1626,7 +1626,7 @@ ADPCM_DECODER(AV_CODEC_ID_ADPCM_SBPRO_2, sample_fmts_s16, adpcm_sbpro_2,
...
@@ -1626,7 +1626,7 @@ ADPCM_DECODER(AV_CODEC_ID_ADPCM_SBPRO_2, sample_fmts_s16, adpcm_sbpro_2,
ADPCM_DECODER
(
AV_CODEC_ID_ADPCM_SBPRO_3
,
sample_fmts_s16
,
adpcm_sbpro_3
,
"ADPCM Sound Blaster Pro 2.6-bit"
);
ADPCM_DECODER
(
AV_CODEC_ID_ADPCM_SBPRO_3
,
sample_fmts_s16
,
adpcm_sbpro_3
,
"ADPCM Sound Blaster Pro 2.6-bit"
);
ADPCM_DECODER
(
AV_CODEC_ID_ADPCM_SBPRO_4
,
sample_fmts_s16
,
adpcm_sbpro_4
,
"ADPCM Sound Blaster Pro 4-bit"
);
ADPCM_DECODER
(
AV_CODEC_ID_ADPCM_SBPRO_4
,
sample_fmts_s16
,
adpcm_sbpro_4
,
"ADPCM Sound Blaster Pro 4-bit"
);
ADPCM_DECODER
(
AV_CODEC_ID_ADPCM_SWF
,
sample_fmts_s16
,
adpcm_swf
,
"ADPCM Shockwave Flash"
);
ADPCM_DECODER
(
AV_CODEC_ID_ADPCM_SWF
,
sample_fmts_s16
,
adpcm_swf
,
"ADPCM Shockwave Flash"
);
ADPCM_DECODER
(
AV_CODEC_ID_ADPCM_THP_LE
,
sample_fmts_s16p
,
adpcm_thp_le
,
"ADPCM Nintendo
Gamecube
THP (little-endian)"
);
ADPCM_DECODER
(
AV_CODEC_ID_ADPCM_THP_LE
,
sample_fmts_s16p
,
adpcm_thp_le
,
"ADPCM Nintendo THP (little-endian)"
);
ADPCM_DECODER
(
AV_CODEC_ID_ADPCM_THP
,
sample_fmts_s16p
,
adpcm_thp
,
"ADPCM Nintendo
Gamecube
THP"
);
ADPCM_DECODER
(
AV_CODEC_ID_ADPCM_THP
,
sample_fmts_s16p
,
adpcm_thp
,
"ADPCM Nintendo THP"
);
ADPCM_DECODER
(
AV_CODEC_ID_ADPCM_XA
,
sample_fmts_s16p
,
adpcm_xa
,
"ADPCM CDROM XA"
);
ADPCM_DECODER
(
AV_CODEC_ID_ADPCM_XA
,
sample_fmts_s16p
,
adpcm_xa
,
"ADPCM CDROM XA"
);
ADPCM_DECODER
(
AV_CODEC_ID_ADPCM_YAMAHA
,
sample_fmts_s16
,
adpcm_yamaha
,
"ADPCM Yamaha"
);
ADPCM_DECODER
(
AV_CODEC_ID_ADPCM_YAMAHA
,
sample_fmts_s16
,
adpcm_yamaha
,
"ADPCM Yamaha"
);
libavcodec/codec_desc.c
View file @
388a6f58
...
@@ -1835,14 +1835,14 @@ static const AVCodecDescriptor codec_descriptors[] = {
...
@@ -1835,14 +1835,14 @@ static const AVCodecDescriptor codec_descriptors[] = {
.
id
=
AV_CODEC_ID_ADPCM_THP
,
.
id
=
AV_CODEC_ID_ADPCM_THP
,
.
type
=
AVMEDIA_TYPE_AUDIO
,
.
type
=
AVMEDIA_TYPE_AUDIO
,
.
name
=
"adpcm_thp"
,
.
name
=
"adpcm_thp"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"ADPCM Nintendo
Gamecube
THP"
),
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"ADPCM Nintendo THP"
),
.
props
=
AV_CODEC_PROP_LOSSY
,
.
props
=
AV_CODEC_PROP_LOSSY
,
},
},
{
{
.
id
=
AV_CODEC_ID_ADPCM_THP_LE
,
.
id
=
AV_CODEC_ID_ADPCM_THP_LE
,
.
type
=
AVMEDIA_TYPE_AUDIO
,
.
type
=
AVMEDIA_TYPE_AUDIO
,
.
name
=
"adpcm_thp_le"
,
.
name
=
"adpcm_thp_le"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"ADPCM Nintendo
Gamecube
THP (Little-Endian)"
),
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"ADPCM Nintendo THP (Little-Endian)"
),
.
props
=
AV_CODEC_PROP_LOSSY
,
.
props
=
AV_CODEC_PROP_LOSSY
,
},
},
{
{
...
...
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