diff options
| author | Rodger Combs <rodger.combs@gmail.com> | 2015-06-23 12:35:34 -0500 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-25 19:29:02 +0200 |
| commit | 388a6f581ab64f75c9f7957442b74cecd59fb14c (patch) | |
| tree | d8d5d8764a67ff396a4d1d1b4980570d2d361d54 | |
| parent | 0643b4bf74a44c9e24cd75a2b99f9d1fd128e4f6 (diff) | |
lavc+doc: adjust names to reflect ADPCM THP not being GameCube-only
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | doc/general.texi | 2 | ||||
| -rw-r--r-- | libavcodec/adpcm.c | 4 | ||||
| -rw-r--r-- | libavcodec/codec_desc.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/doc/general.texi b/doc/general.texi index 4a1f86751d..68ff58bf41 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -880,7 +880,7 @@ following image formats are supported: @item ADPCM MS IMA @tab X @tab X @item ADPCM Nintendo Gamecube AFC @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 SEGA CRI ADX @tab X @tab X @tab Used in Sega Dreamcast games. diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index c6ca8803db..bad0be4627 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -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_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_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_YAMAHA, sample_fmts_s16, adpcm_yamaha, "ADPCM Yamaha"); diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index bb8e1b4108..729e855b90 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1835,14 +1835,14 @@ static const AVCodecDescriptor codec_descriptors[] = { .id = AV_CODEC_ID_ADPCM_THP, .type = AVMEDIA_TYPE_AUDIO, .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, }, { .id = AV_CODEC_ID_ADPCM_THP_LE, .type = AVMEDIA_TYPE_AUDIO, .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, }, { |