From 459fe331e9068dc916929021579c26021c097b57 Mon Sep 17 00:00:00 2001 From: Reimar Döffinger Date: Thu, 24 Mar 2011 21:27:05 +0100 Subject: ac3dec: avoid pointless alloc and indirection for input_buffer Since we now always allocate it, it can simply be made part of the context instead. --- libavcodec/ac3dec.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'libavcodec/ac3dec.h') diff --git a/libavcodec/ac3dec.h b/libavcodec/ac3dec.h index a7cebafbe9..38262514b6 100644 --- a/libavcodec/ac3dec.h +++ b/libavcodec/ac3dec.h @@ -62,11 +62,13 @@ #define SPX_MAX_BANDS 17 +/** Large enough for maximum possible frame size when the specification limit is ignored */ +#define AC3_FRAME_BUFFER_SIZE 32768 + typedef struct { AVClass *class; ///< class for AVOptions AVCodecContext *avctx; ///< parent context GetBitContext gbc; ///< bitstream reader - uint8_t *input_buffer; ///< temp buffer to prevent overread ///@name Bit stream information ///@{ @@ -202,6 +204,7 @@ typedef struct { DECLARE_ALIGNED(32, float, window)[AC3_BLOCK_SIZE]; ///< window coefficients DECLARE_ALIGNED(32, float, tmp_output)[AC3_BLOCK_SIZE]; ///< temporary storage for output before windowing DECLARE_ALIGNED(32, float, output)[AC3_MAX_CHANNELS][AC3_BLOCK_SIZE]; ///< output after imdct transform and windowing + DECLARE_ALIGNED(32, uint8_t, input_buffer)[AC3_FRAME_BUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE]; ///< temp buffer to prevent overread ///@} } AC3DecodeContext; -- cgit v1.2.3