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
8dea7618
Commit
8dea7618
authored
Oct 23, 2015
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec: extend long decription for adpcm psx codec
Signed-off-by:
Paul B Mahol
<
onemda@gmail.com
>
parent
dd456245
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
adpcm.c
libavcodec/adpcm.c
+1
-1
codec_desc.c
libavcodec/codec_desc.c
+1
-1
No files found.
libavcodec/adpcm.c
View file @
8dea7618
...
@@ -1664,7 +1664,7 @@ ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_SMJPEG, sample_fmts_s16, adpcm_ima_smjpeg,
...
@@ -1664,7 +1664,7 @@ ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_SMJPEG, sample_fmts_s16, adpcm_ima_smjpeg,
ADPCM_DECODER
(
AV_CODEC_ID_ADPCM_IMA_WAV
,
sample_fmts_s16p
,
adpcm_ima_wav
,
"ADPCM IMA WAV"
);
ADPCM_DECODER
(
AV_CODEC_ID_ADPCM_IMA_WAV
,
sample_fmts_s16p
,
adpcm_ima_wav
,
"ADPCM IMA WAV"
);
ADPCM_DECODER
(
AV_CODEC_ID_ADPCM_IMA_WS
,
sample_fmts_both
,
adpcm_ima_ws
,
"ADPCM IMA Westwood"
);
ADPCM_DECODER
(
AV_CODEC_ID_ADPCM_IMA_WS
,
sample_fmts_both
,
adpcm_ima_ws
,
"ADPCM IMA Westwood"
);
ADPCM_DECODER
(
AV_CODEC_ID_ADPCM_MS
,
sample_fmts_s16
,
adpcm_ms
,
"ADPCM Microsoft"
);
ADPCM_DECODER
(
AV_CODEC_ID_ADPCM_MS
,
sample_fmts_s16
,
adpcm_ms
,
"ADPCM Microsoft"
);
ADPCM_DECODER
(
AV_CODEC_ID_ADPCM_PSX
,
sample_fmts_s16p
,
adpcm_psx
,
"ADPCM P
SX
"
);
ADPCM_DECODER
(
AV_CODEC_ID_ADPCM_PSX
,
sample_fmts_s16p
,
adpcm_psx
,
"ADPCM P
laystation
"
);
ADPCM_DECODER
(
AV_CODEC_ID_ADPCM_SBPRO_2
,
sample_fmts_s16
,
adpcm_sbpro_2
,
"ADPCM Sound Blaster Pro 2-bit"
);
ADPCM_DECODER
(
AV_CODEC_ID_ADPCM_SBPRO_2
,
sample_fmts_s16
,
adpcm_sbpro_2
,
"ADPCM Sound Blaster Pro 2-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_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"
);
...
...
libavcodec/codec_desc.c
View file @
8dea7618
...
@@ -1989,7 +1989,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
...
@@ -1989,7 +1989,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
.
id
=
AV_CODEC_ID_ADPCM_PSX
,
.
id
=
AV_CODEC_ID_ADPCM_PSX
,
.
type
=
AVMEDIA_TYPE_AUDIO
,
.
type
=
AVMEDIA_TYPE_AUDIO
,
.
name
=
"adpcm_psx"
,
.
name
=
"adpcm_psx"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"ADPCM P
SX
"
),
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"ADPCM P
laystation
"
),
.
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