diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-03 15:05:00 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-03 15:05:18 +0200 |
commit | 4cfe3b7405431060900d8a05402c2f14ec99f034 (patch) | |
tree | 3049db3ef9739aacbc69554cc17ccf309591b5be /libavcodec/codec_desc.c | |
parent | 50fd98b7ac4c410f4413d382eecb415011b37920 (diff) | |
parent | 7df9e693a34c84c698da60426c78140c950f95ed (diff) | |
download | android_external_ffmpeg-4cfe3b7405431060900d8a05402c2f14ec99f034.tar.gz android_external_ffmpeg-4cfe3b7405431060900d8a05402c2f14ec99f034.tar.bz2 android_external_ffmpeg-4cfe3b7405431060900d8a05402c2f14ec99f034.zip |
Merge commit '7df9e693a34c84c698da60426c78140c950f95ed'
* commit '7df9e693a34c84c698da60426c78140c950f95ed':
cosmetics: Fix ATRAC codec name spelling
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/codec_desc.c')
-rw-r--r-- | libavcodec/codec_desc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index ff468f6fcf..523b61761f 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -2129,7 +2129,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .id = AV_CODEC_ID_ATRAC3, .type = AVMEDIA_TYPE_AUDIO, .name = "atrac3", - .long_name = NULL_IF_CONFIG_SMALL("Atrac 3 (Adaptive TRansform Acoustic Coding 3)"), + .long_name = NULL_IF_CONFIG_SMALL("ATRAC3 (Adaptive TRansform Acoustic Coding 3)"), .props = AV_CODEC_PROP_LOSSY, }, #if FF_API_VOXWARE @@ -2194,7 +2194,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .id = AV_CODEC_ID_ATRAC3P, .type = AVMEDIA_TYPE_AUDIO, .name = "atrac3p", - .long_name = NULL_IF_CONFIG_SMALL("Sony ATRAC3+"), + .long_name = NULL_IF_CONFIG_SMALL("ATRAC3+ (Adaptive TRansform Acoustic Coding 3+)"), .props = AV_CODEC_PROP_LOSSY, }, { @@ -2243,7 +2243,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .id = AV_CODEC_ID_ATRAC1, .type = AVMEDIA_TYPE_AUDIO, .name = "atrac1", - .long_name = NULL_IF_CONFIG_SMALL("Atrac 1 (Adaptive TRansform Acoustic Coding)"), + .long_name = NULL_IF_CONFIG_SMALL("ATRAC1 (Adaptive TRansform Acoustic Coding)"), .props = AV_CODEC_PROP_LOSSY, }, { |