summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2008-08-03 16:42:32 +0000
committerJustin Ruggles <justin.ruggles@gmail.com>2008-08-03 16:42:32 +0000
commit14b7062829968e3e6f8974cbea1bbdbf6e83e095 (patch)
tree2cd2b7adb894d80aec74dede0fabbe67b8aec34c /libavcodec
parent2d47c3de988c3448bc8ed1799dd3df5cdd16549f (diff)
cosmetics: make all references to AC-3 capitalized and hyphenated
Originally committed as revision 14523 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/aac_ac3_parser.c4
-rw-r--r--libavcodec/aac_ac3_parser.h2
-rw-r--r--libavcodec/ac3.c6
-rw-r--r--libavcodec/ac3.h6
-rw-r--r--libavcodec/ac3_parser.c2
-rw-r--r--libavcodec/ac3_parser.h2
-rw-r--r--libavcodec/ac3dec.c4
-rw-r--r--libavcodec/ac3dec.h4
-rw-r--r--libavcodec/ac3dec_data.c4
-rw-r--r--libavcodec/ac3dec_data.h2
-rw-r--r--libavcodec/ac3enc.c8
-rw-r--r--libavcodec/ac3tab.c6
-rw-r--r--libavcodec/ac3tab.h2
-rw-r--r--libavcodec/resample.c2
14 files changed, 27 insertions, 27 deletions
diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c
index f28f3f2678..cfb1a222be 100644
--- a/libavcodec/aac_ac3_parser.c
+++ b/libavcodec/aac_ac3_parser.c
@@ -1,5 +1,5 @@
/*
- * Common AAC and AC3 parser
+ * Common AAC and AC-3 parser
* Copyright (c) 2003 Fabrice Bellard.
* Copyright (c) 2003 Michael Niedermayer.
*
@@ -71,7 +71,7 @@ get_next:
/* update codec info */
avctx->sample_rate = s->sample_rate;
- /* allow downmixing to stereo (or mono for AC3) */
+ /* allow downmixing to stereo (or mono for AC-3) */
if(avctx->request_channels > 0 &&
avctx->request_channels < s->channels &&
(avctx->request_channels <= 2 ||
diff --git a/libavcodec/aac_ac3_parser.h b/libavcodec/aac_ac3_parser.h
index d25502d721..36ea0e0671 100644
--- a/libavcodec/aac_ac3_parser.h
+++ b/libavcodec/aac_ac3_parser.h
@@ -1,5 +1,5 @@
/*
- * Common AAC and AC3 parser prototypes
+ * Common AAC and AC-3 parser prototypes
* Copyright (c) 2003 Fabrice Bellard.
* Copyright (c) 2003 Michael Niedermayer.
*
diff --git a/libavcodec/ac3.c b/libavcodec/ac3.c
index 6b18930ca1..e4117f1a15 100644
--- a/libavcodec/ac3.c
+++ b/libavcodec/ac3.c
@@ -1,5 +1,5 @@
/*
- * Common code between AC3 encoder and decoder
+ * Common code between the AC-3 encoder and decoder
* Copyright (c) 2000 Fabrice Bellard.
*
* This file is part of FFmpeg.
@@ -21,7 +21,7 @@
/**
* @file ac3.c
- * Common code between AC3 encoder and decoder.
+ * Common code between the AC-3 encoder and decoder.
*/
#include "avcodec.h"
@@ -197,7 +197,7 @@ void ff_ac3_bit_alloc_calc_bap(int16_t *mask, int16_t *psd, int start, int end,
} while (end > band_start_tab[j++]);
}
-/* AC3 bit allocation. The algorithm is the one described in the AC3
+/* AC-3 bit allocation. The algorithm is the one described in the AC-3
spec. */
void ac3_parametric_bit_allocation(AC3BitAllocParameters *s, uint8_t *bap,
int8_t *exp, int start, int end,
diff --git a/libavcodec/ac3.h b/libavcodec/ac3.h
index 2eae0ea8cc..3b18a15a7c 100644
--- a/libavcodec/ac3.h
+++ b/libavcodec/ac3.h
@@ -1,5 +1,5 @@
/*
- * Common code between AC3 encoder and decoder
+ * Common code between the AC-3 encoder and decoder
* Copyright (c) 2000, 2001, 2002 Fabrice Bellard.
*
* This file is part of FFmpeg.
@@ -21,7 +21,7 @@
/**
* @file ac3.h
- * Common code between AC3 encoder and decoder.
+ * Common code between the AC-3 encoder and decoder.
*/
#ifndef FFMPEG_AC3_H
@@ -32,7 +32,7 @@
#define AC3_MAX_CODED_FRAME_SIZE 3840 /* in bytes */
#define AC3_MAX_CHANNELS 6 /* including LFE channel */
-#define NB_BLOCKS 6 /* number of PCM blocks inside an AC3 frame */
+#define NB_BLOCKS 6 /* number of PCM blocks inside an AC-3 frame */
#define AC3_FRAME_SIZE (NB_BLOCKS * 256)
/* exponent encoding strategy */
diff --git a/libavcodec/ac3_parser.c b/libavcodec/ac3_parser.c
index a2f3c82f48..b9a25abc42 100644
--- a/libavcodec/ac3_parser.c
+++ b/libavcodec/ac3_parser.c
@@ -1,5 +1,5 @@
/*
- * AC3 parser
+ * AC-3 parser
* Copyright (c) 2003 Fabrice Bellard.
* Copyright (c) 2003 Michael Niedermayer.
*
diff --git a/libavcodec/ac3_parser.h b/libavcodec/ac3_parser.h
index 1af7fa1407..e49492558a 100644
--- a/libavcodec/ac3_parser.h
+++ b/libavcodec/ac3_parser.h
@@ -1,5 +1,5 @@
/*
- * AC3 parser prototypes
+ * AC-3 parser prototypes
* Copyright (c) 2003 Fabrice Bellard.
* Copyright (c) 2003 Michael Niedermayer.
*
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c
index 51cda0bcbf..efa3644e02 100644
--- a/libavcodec/ac3dec.c
+++ b/libavcodec/ac3dec.c
@@ -228,7 +228,7 @@ static av_cold int ac3_decode_init(AVCodecContext *avctx)
/**
* Parse the 'sync info' and 'bit stream info' from the AC-3 bitstream.
* GetBitContext within AC3DecodeContext must point to
- * start of the synchronized ac3 bitstream.
+ * the start of the synchronized AC-3 bitstream.
*/
static int ac3_parse_header(AC3DecodeContext *s)
{
@@ -268,7 +268,7 @@ static int ac3_parse_header(AC3DecodeContext *s)
}
/**
- * Common function to parse AC3 or E-AC3 frame header
+ * Common function to parse AC-3 or E-AC-3 frame header
*/
static int parse_frame_header(AC3DecodeContext *s)
{
diff --git a/libavcodec/ac3dec.h b/libavcodec/ac3dec.h
index 8c41639d5f..76f9a9ff5b 100644
--- a/libavcodec/ac3dec.h
+++ b/libavcodec/ac3dec.h
@@ -1,5 +1,5 @@
/*
- * Common code between AC3 and E-AC3 decoder
+ * Common code between the AC-3 and E-AC-3 decoders
* Copyright (c) 2007 Bartlomiej Wolowiec <bartek.wolowiec@gmail.com>
*
* This file is part of FFmpeg.
@@ -21,7 +21,7 @@
/**
* @file ac3.h
- * Common code between AC3 and E-AC3 decoder.
+ * Common code between the AC-3 and E-AC-3 decoders.
*/
#ifndef FFMPEG_AC3DEC_H
diff --git a/libavcodec/ac3dec_data.c b/libavcodec/ac3dec_data.c
index ce361e48c6..86e61aa379 100644
--- a/libavcodec/ac3dec_data.c
+++ b/libavcodec/ac3dec_data.c
@@ -1,5 +1,5 @@
/*
- * AC3 and E-AC3 decoder tables
+ * AC-3 and E-AC-3 decoder tables
* Copyright (c) 2007 Bartlomiej Wolowiec <bartek.wolowiec@gmail.com>
*
* This file is part of FFmpeg.
@@ -21,7 +21,7 @@
/**
* @file ac3dec_data.c
- * tables taken directly from AC3 spec.
+ * tables taken directly from the AC-3 spec.
*/
#include "ac3dec_data.h"
diff --git a/libavcodec/ac3dec_data.h b/libavcodec/ac3dec_data.h
index 7cbb945269..cbab08f55c 100644
--- a/libavcodec/ac3dec_data.h
+++ b/libavcodec/ac3dec_data.h
@@ -1,5 +1,5 @@
/*
- * AC3 and E-AC3 decoder tables
+ * AC-3 and E-AC-3 decoder tables
* Copyright (c) 2007 Bartlomiej Wolowiec <bartek.wolowiec@gmail.com>
*
* This file is part of FFmpeg.
diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c
index b373b261eb..faea64a928 100644
--- a/libavcodec/ac3enc.c
+++ b/libavcodec/ac3enc.c
@@ -1,5 +1,5 @@
/*
- * The simplest AC3 encoder
+ * The simplest AC-3 encoder
* Copyright (c) 2000 Fabrice Bellard.
*
* This file is part of FFmpeg.
@@ -21,7 +21,7 @@
/**
* @file ac3enc.c
- * The simplest AC3 encoder.
+ * The simplest AC-3 encoder.
*/
//#define DEBUG
//#define DEBUG_BITALLOC
@@ -705,7 +705,7 @@ static av_cold int AC3_encode_init(AVCodecContext *avctx)
return 0;
}
-/* output the AC3 frame header */
+/* output the AC-3 frame header */
static void output_frame_header(AC3EncodeContext *s, unsigned char *frame)
{
init_put_bits(&s->pb, frame, AC3_MAX_CODED_FRAME_SIZE);
@@ -772,7 +772,7 @@ static inline int asym_quant(int c, int e, int qbits)
return v & ((1 << qbits)-1);
}
-/* Output one audio block. There are NB_BLOCKS audio blocks in one AC3
+/* Output one audio block. There are NB_BLOCKS audio blocks in one AC-3
frame */
static void output_audio_block(AC3EncodeContext *s,
uint8_t exp_strategy[AC3_MAX_CHANNELS],
diff --git a/libavcodec/ac3tab.c b/libavcodec/ac3tab.c
index 66afcd4437..8e1e7eb37c 100644
--- a/libavcodec/ac3tab.c
+++ b/libavcodec/ac3tab.c
@@ -1,5 +1,5 @@
/*
- * AC3 tables
+ * AC-3 tables
* copyright (c) 2001 Fabrice Bellard
*
* This file is part of FFmpeg.
@@ -21,7 +21,7 @@
/**
* @file ac3tab.c
- * tables taken directly from AC3 spec.
+ * tables taken directly from the AC-3 spec.
*/
#include "ac3tab.h"
@@ -88,7 +88,7 @@ const uint16_t ff_ac3_bitrate_tab[19] = {
160, 192, 224, 256, 320, 384, 448, 512, 576, 640
};
-/* AC3 MDCT window */
+/* AC-3 MDCT window */
/* MDCT window */
const int16_t ff_ac3_window[256] = {
diff --git a/libavcodec/ac3tab.h b/libavcodec/ac3tab.h
index 1a98129e62..7b965d8497 100644
--- a/libavcodec/ac3tab.h
+++ b/libavcodec/ac3tab.h
@@ -1,5 +1,5 @@
/*
- * AC3 tables
+ * AC-3 tables
* Copyright (c) 2000, 2001, 2002 Fabrice Bellard.
*
* This file is part of FFmpeg.
diff --git a/libavcodec/resample.c b/libavcodec/resample.c
index c6547d8d81..c4a5dbdfce 100644
--- a/libavcodec/resample.c
+++ b/libavcodec/resample.c
@@ -154,7 +154,7 @@ ReSampleContext *audio_resample_init(int output_channels, int input_channels,
s->filter_channels = s->output_channels;
/*
- * ac3 output is the only case where filter_channels could be greater than 2.
+ * AC-3 output is the only case where filter_channels could be greater than 2.
* input channels can't be greater than 2, so resample the 2 channels and then
* expand to 6 channels after the resampling.
*/