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 /libavformat | |
| parent | 50fd98b7ac4c410f4413d382eecb415011b37920 (diff) | |
| parent | 7df9e693a34c84c698da60426c78140c950f95ed (diff) | |
| download | ffmpeg-4cfe3b7405431060900d8a05402c2f14ec99f034.tar.gz | |
Merge commit '7df9e693a34c84c698da60426c78140c950f95ed'
* commit '7df9e693a34c84c698da60426c78140c950f95ed':
cosmetics: Fix ATRAC codec name spelling
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/omadec.c | 2 | ||||
| -rw-r--r-- | libavformat/rmdec.c | 2 | ||||
| -rw-r--r-- | libavformat/spdif.h | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/omadec.c b/libavformat/omadec.c index d05795494c..fd7eb0bf7f 100644 --- a/libavformat/omadec.c +++ b/libavformat/omadec.c @@ -347,7 +347,7 @@ static int oma_read_header(AVFormatContext *s) st->codec->sample_rate = samplerate; st->codec->bit_rate = st->codec->sample_rate * framesize * 8 / 1024; - /* fake the atrac3 extradata + /* fake the ATRAC3 extradata * (wav format, makes stream copy to wav work) */ st->codec->extradata_size = 14; edata = av_mallocz(14 + FF_INPUT_BUFFER_PADDING_SIZE); diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index 38bddc3760..91f4241da4 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -31,7 +31,7 @@ #include "rmsipr.h" #include "rm.h" -#define DEINT_ID_GENR MKTAG('g', 'e', 'n', 'r') ///< interleaving for Cooker/Atrac +#define DEINT_ID_GENR MKTAG('g', 'e', 'n', 'r') ///< interleaving for Cooker/ATRAC #define DEINT_ID_INT0 MKTAG('I', 'n', 't', '0') ///< no interleaving needed #define DEINT_ID_INT4 MKTAG('I', 'n', 't', '4') ///< interleaving for 28.8 #define DEINT_ID_SIPR MKTAG('s', 'i', 'p', 'r') ///< interleaving for Sipro diff --git a/libavformat/spdif.h b/libavformat/spdif.h index 0a0d962ba4..fee4ff710b 100644 --- a/libavformat/spdif.h +++ b/libavformat/spdif.h @@ -41,9 +41,9 @@ enum IEC61937DataType { IEC61937_DTS1 = 0x0B, ///< DTS type I (512 samples) IEC61937_DTS2 = 0x0C, ///< DTS type II (1024 samples) IEC61937_DTS3 = 0x0D, ///< DTS type III (2048 samples) - IEC61937_ATRAC = 0x0E, ///< Atrac data - IEC61937_ATRAC3 = 0x0F, ///< Atrac 3 data - IEC61937_ATRACX = 0x10, ///< Atrac 3 plus data + IEC61937_ATRAC = 0x0E, ///< ATRAC data + IEC61937_ATRAC3 = 0x0F, ///< ATRAC3 data + IEC61937_ATRACX = 0x10, ///< ATRAC3+ data IEC61937_DTSHD = 0x11, ///< DTS HD data IEC61937_WMAPRO = 0x12, ///< WMA 9 Professional data IEC61937_MPEG2_AAC_LSF_2048 = 0x13, ///< MPEG-2 AAC ADTS half-rate low sampling frequency |