eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-06-16 04:32:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '7df9e693a34c84c698da60426c78140c950f95ed'

Browse Source 
* commit '7df9e693a34c84c698da60426c78140c950f95ed':
  cosmetics: Fix ATRAC codec name spelling

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-09-03 15:05:00 +02:00
parent 50fd98b7ac 7df9e693a3
commit 4cfe3b7405
12 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavcodec/atrac.c
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Atrac common functions
* ATRAC common functions
* Copyright (c) 2006-2008 Maxim Poliakovski
* Copyright (c) 2006-2008 Benjamin Larsson
*
libavcodec/atrac.h
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Atrac common data
* ATRAC common data
* Copyright (c) 2009 Maxim Poliakovski
* Copyright (c) 2009 Benjamin Larsson
*
@@ -22,7 +22,7 @@
/**
* @file
* Atrac common header
* ATRAC common header
*/
#ifndef AVCODEC_ATRAC_H
libavcodec/atrac1.c
+3 -3
View File
@@ -1,5 +1,5 @@
/*
* Atrac 1 compatible decoder
* ATRAC1 compatible decoder
* Copyright (c) 2009 Maxim Poliakovski
* Copyright (c) 2009 Benjamin Larsson
*
@@ -22,7 +22,7 @@
/**
* @file
* Atrac 1 compatible decoder.
* ATRAC1 compatible decoder.
* This decoder handles raw ATRAC1 data and probably SDDS data.
*/
@@ -377,6 +377,7 @@ static av_cold int atrac1_decode_init(AVCodecContext *avctx)
AVCodec ff_atrac1_decoder = {
.name = "atrac1",
.long_name = NULL_IF_CONFIG_SMALL("ATRAC1 (Adaptive TRansform Acoustic Coding)"),
.type = AVMEDIA_TYPE_AUDIO,
.id = AV_CODEC_ID_ATRAC1,
.priv_data_size = sizeof(AT1Ctx),
@@ -384,7 +385,6 @@ AVCodec ff_atrac1_decoder = {
.close = atrac1_decode_end,
.decode = atrac1_decode_frame,
.capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("Atrac 1 (Adaptive TRansform Acoustic Coding)"),
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
AV_SAMPLE_FMT_NONE },
};
libavcodec/atrac1data.h
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Atrac 1 compatible decoder data
* ATRAC 1 compatible decoder data
* Copyright (c) 2009 Maxim Poliakovski
* Copyright (c) 2009 Benjamin Larsson
*
@@ -22,7 +22,7 @@
/**
* @file
* Atrac 1 compatible decoder data
* ATRAC1 compatible decoder data
*/
#ifndef AVCODEC_ATRAC1DATA_H
libavcodec/atrac3.c
+4 -4
View File
@@ -1,5 +1,5 @@
/*
* Atrac 3 compatible decoder
* ATRAC3 compatible decoder
* Copyright (c) 2006-2008 Maxim Poliakovski
* Copyright (c) 2006-2008 Benjamin Larsson
*
@@ -22,10 +22,10 @@
/**
* @file
* Atrac 3 compatible decoder.
* ATRAC3 compatible decoder.
* This decoder handles Sony's ATRAC3 data.
*
* Container formats used to store atrac 3 data:
* Container formats used to store ATRAC3 data:
* RealMedia (.rm), RIFF WAV (.wav, .at3), Sony OpenMG (.oma, .aa3).
*
* To use this decoder, a calling application must supply the extradata
@@ -1002,6 +1002,7 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx)
AVCodec ff_atrac3_decoder = {
.name = "atrac3",
.long_name = NULL_IF_CONFIG_SMALL("ATRAC3 (Adaptive TRansform Acoustic Coding 3)"),
.type = AVMEDIA_TYPE_AUDIO,
.id = AV_CODEC_ID_ATRAC3,
.priv_data_size = sizeof(ATRAC3Context),
@@ -1009,7 +1010,6 @@ AVCodec ff_atrac3_decoder = {
.close = atrac3_decode_close,
.decode = atrac3_decode_frame,
.capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("Atrac 3 (Adaptive TRansform Acoustic Coding 3)"),
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
AV_SAMPLE_FMT_NONE },
};
libavcodec/atrac3data.h
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Atrac 3 compatible decoder data
* ATRAC3 compatible decoder data
* Copyright (c) 2006-2007 Maxim Poliakovski
* Copyright (c) 2006-2007 Benjamin Larsson
*
@@ -22,7 +22,7 @@
/**
* @file
* Atrac 3 AKA RealAudio 8 compatible decoder data
* ATRAC3 AKA RealAudio 8 compatible decoder data
*/
#ifndef AVCODEC_ATRAC3DATA_H
libavcodec/codec_desc.c
+3 -3
View File
@@ -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,
},
{