summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2010-12-14 14:52:08 +0000
committerJustin Ruggles <justin.ruggles@gmail.com>2010-12-14 14:52:08 +0000
commit1971ab6ed64b6626903d830628d142b6e2e063a7 (patch)
tree923cff8b46ea4c87042d02ac3ae894fe28292159
parente8b552a818b0fcb2bbc779f2ba521aa21ad4ce5e (diff)
Change output_frame_end() to return void. The frame size is already known.
Originally committed as revision 25975 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/ac3enc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c
index a7211c1a86..71b62c5f48 100644
--- a/libavcodec/ac3enc.c
+++ b/libavcodec/ac3enc.c
@@ -1038,7 +1038,7 @@ static unsigned int pow_poly(unsigned int a, unsigned int n, unsigned int poly)
/**
* Fill the end of the frame with 0's and compute the two CRCs.
*/
-static int output_frame_end(AC3EncodeContext *s)
+static void output_frame_end(AC3EncodeContext *s)
{
int frame_size, frame_size_58, n, crc1, crc2, crc_inv;
uint8_t *frame;
@@ -1069,8 +1069,6 @@ static int output_frame_end(AC3EncodeContext *s)
frame + 2 * frame_size_58,
(frame_size - frame_size_58) * 2 - 2));
AV_WB16(frame + 2*frame_size - 2, crc2);
-
- return frame_size * 2;
}
@@ -1188,7 +1186,9 @@ static int ac3_encode_frame(AVCodecContext *avctx,
output_audio_block(s, exp_strategy[blk], encoded_exp[blk],
bap[blk], mdct_coef[blk], exp_shift[blk], blk);
}
- return output_frame_end(s);
+ output_frame_end(s);
+
+ return s->frame_size * 2;
}