aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2008-08-05 01:31:40 +0000
committerJustin Ruggles <justin.ruggles@gmail.com>2008-08-05 01:31:40 +0000
commit022845ed05f22e046eb64ca4f460f399df7b8ed6 (patch)
treeeb6ede5ef4b45309aa5f9668faf05fe859d4f7b6
parent3fa1e8185acbce5ae0f0d77ead53e9175347817c (diff)
downloadffmpeg-022845ed05f22e046eb64ca4f460f399df7b8ed6.tar.gz
cosmetics: change function name and comments to refer to block decoding
instead of block parsing Originally committed as revision 14613 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/ac3dec.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c
index cca80b5c13..06228fbf6c 100644
--- a/libavcodec/ac3dec.c
+++ b/libavcodec/ac3dec.c
@@ -711,9 +711,9 @@ static void ac3_upmix_delay(AC3DecodeContext *s)
}
/**
- * Parse an audio block from AC-3 bitstream.
+ * Decode a single audio block from the AC-3 bitstream.
*/
-static int ac3_parse_audio_block(AC3DecodeContext *s, int blk)
+static int decode_audio_block(AC3DecodeContext *s, int blk)
{
int fbw_channels = s->fbw_channels;
int channel_mode = s->channel_mode;
@@ -1164,10 +1164,10 @@ static int ac3_decode_frame(AVCodecContext * avctx, void *data, int *data_size,
s->output_mode = s->out_channels == 1 ? AC3_CHMODE_MONO : AC3_CHMODE_STEREO;
}
- /* parse the audio blocks */
+ /* decode the audio blocks */
for (blk = 0; blk < s->num_blocks; blk++) {
- if (!err && ac3_parse_audio_block(s, blk)) {
- av_log(avctx, AV_LOG_ERROR, "error parsing the audio block\n");
+ if (!err && decode_audio_block(s, blk)) {
+ av_log(avctx, AV_LOG_ERROR, "error decoding the audio block\n");
}
/* interleave output samples */