Browse Source
lavc+doc: adjust names to reflect ADPCM THP not being GameCube-only
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>tags/n2.8
Rodger Combs
Michael Niedermayer
10 years ago
3 changed files with 5 additions and 5 deletions
Unified View
Diff Options
-
+1 -1doc/general.texi
-
+2 -2libavcodec/adpcm.c
-
+2 -2libavcodec/codec_desc.c
+ 1
- 1
doc/general.texi
View File
| @@ -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. | ||||
+ 2
- 2
libavcodec/adpcm.c
View File
| @@ -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, sample_fmts_s16p, adpcm_thp, "ADPCM Nintendo Gamecube THP"); | |||||
| 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 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"); | ||||
+ 2
- 2
libavcodec/codec_desc.c
View File
| @@ -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, | ||||
| }, | }, | ||||
| { | { | ||||