summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2010-12-14 14:53:20 +0000
committerJustin Ruggles <justin.ruggles@gmail.com>2010-12-14 14:53:20 +0000
commit5b44ede0ba20bc823f833885069febab6016a429 (patch)
tree6012c0fc6efcf412dcb48115bf0b598904650fa9 /libavcodec
parentd7da80806cc4ea91e4de37feae49fc2ac202bd20 (diff)
cosmetics: rearrange some functions
Originally committed as revision 25996 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/ac3enc.c62
1 files changed, 31 insertions, 31 deletions
diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c
index 34fc9a4ebc..49bf44f404 100644
--- a/libavcodec/ac3enc.c
+++ b/libavcodec/ac3enc.c
@@ -925,37 +925,6 @@ static int compute_bit_allocation(AC3EncodeContext *s,
/**
- * Write the AC-3 frame header to the output bitstream.
- */
-static void output_frame_header(AC3EncodeContext *s)
-{
- put_bits(&s->pb, 16, 0x0b77); /* frame header */
- put_bits(&s->pb, 16, 0); /* crc1: will be filled later */
- put_bits(&s->pb, 2, s->bit_alloc.sr_code);
- put_bits(&s->pb, 6, s->frame_size_code + (s->frame_size - s->frame_size_min) / 2);
- put_bits(&s->pb, 5, s->bitstream_id);
- put_bits(&s->pb, 3, s->bitstream_mode);
- put_bits(&s->pb, 3, s->channel_mode);
- if ((s->channel_mode & 0x01) && s->channel_mode != AC3_CHMODE_MONO)
- put_bits(&s->pb, 2, 1); /* XXX -4.5 dB */
- if (s->channel_mode & 0x04)
- put_bits(&s->pb, 2, 1); /* XXX -6 dB */
- if (s->channel_mode == AC3_CHMODE_STEREO)
- put_bits(&s->pb, 2, 0); /* surround not indicated */
- put_bits(&s->pb, 1, s->lfe_on); /* LFE */
- put_bits(&s->pb, 5, 31); /* dialog norm: -31 db */
- put_bits(&s->pb, 1, 0); /* no compression control word */
- put_bits(&s->pb, 1, 0); /* no lang code */
- put_bits(&s->pb, 1, 0); /* no audio production info */
- put_bits(&s->pb, 1, 0); /* no copyright */
- put_bits(&s->pb, 1, 1); /* original bitstream */
- put_bits(&s->pb, 1, 0); /* no time code 1 */
- put_bits(&s->pb, 1, 0); /* no time code 2 */
- put_bits(&s->pb, 1, 0); /* no additional bit stream info */
-}
-
-
-/**
* Symmetric quantization on 'levels' levels.
*/
static inline int sym_quant(int c, int e, int levels)
@@ -999,6 +968,37 @@ static inline int asym_quant(int c, int e, int qbits)
/**
+ * Write the AC-3 frame header to the output bitstream.
+ */
+static void output_frame_header(AC3EncodeContext *s)
+{
+ put_bits(&s->pb, 16, 0x0b77); /* frame header */
+ put_bits(&s->pb, 16, 0); /* crc1: will be filled later */
+ put_bits(&s->pb, 2, s->bit_alloc.sr_code);
+ put_bits(&s->pb, 6, s->frame_size_code + (s->frame_size - s->frame_size_min) / 2);
+ put_bits(&s->pb, 5, s->bitstream_id);
+ put_bits(&s->pb, 3, s->bitstream_mode);
+ put_bits(&s->pb, 3, s->channel_mode);
+ if ((s->channel_mode & 0x01) && s->channel_mode != AC3_CHMODE_MONO)
+ put_bits(&s->pb, 2, 1); /* XXX -4.5 dB */
+ if (s->channel_mode & 0x04)
+ put_bits(&s->pb, 2, 1); /* XXX -6 dB */
+ if (s->channel_mode == AC3_CHMODE_STEREO)
+ put_bits(&s->pb, 2, 0); /* surround not indicated */
+ put_bits(&s->pb, 1, s->lfe_on); /* LFE */
+ put_bits(&s->pb, 5, 31); /* dialog norm: -31 db */
+ put_bits(&s->pb, 1, 0); /* no compression control word */
+ put_bits(&s->pb, 1, 0); /* no lang code */
+ put_bits(&s->pb, 1, 0); /* no audio production info */
+ put_bits(&s->pb, 1, 0); /* no copyright */
+ put_bits(&s->pb, 1, 1); /* original bitstream */
+ put_bits(&s->pb, 1, 0); /* no time code 1 */
+ put_bits(&s->pb, 1, 0); /* no time code 2 */
+ put_bits(&s->pb, 1, 0); /* no additional bit stream info */
+}
+
+
+/**
* Write one audio block to the output bitstream.
*/
static void output_audio_block(AC3EncodeContext *s,