diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2008-08-20 00:08:59 +0000 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2008-08-20 00:08:59 +0000 |
| commit | 8e33132babaff31f74f6788efbe4b660a142c096 (patch) | |
| tree | 0cc7dc2dad7af7c8ba2e76ba3f8f931a20b4e66b | |
| parent | ba99cfc2130025cd63a0ad767a1ee9293c2936f1 (diff) | |
| download | ffmpeg-8e33132babaff31f74f6788efbe4b660a142c096.tar.gz | |
rename AC3_MAX_FRAME_SIZE to AC3_FRAME_BUFFER_SIZE and increase the size
Originally committed as revision 14858 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/ac3dec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index a16a60c214..4760197b29 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -37,8 +37,8 @@ #include "ac3dec.h" #include "ac3dec_data.h" -/** Maximum possible frame size when the specification limit is ignored */ -#define AC3_MAX_FRAME_SIZE 21695 +/** Large enough for maximum possible frame size when the specification limit is ignored */ +#define AC3_FRAME_BUFFER_SIZE 32768 /** * table for ungrouping 3 values in 7 bits. @@ -215,7 +215,7 @@ static av_cold int ac3_decode_init(AVCodecContext *avctx) /* allocate context input buffer */ if (avctx->error_resilience >= FF_ER_CAREFUL) { - s->input_buffer = av_mallocz(AC3_MAX_FRAME_SIZE + FF_INPUT_BUFFER_PADDING_SIZE); + s->input_buffer = av_mallocz(AC3_FRAME_BUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE); if (!s->input_buffer) return AVERROR_NOMEM; } @@ -1042,7 +1042,7 @@ static int ac3_decode_frame(AVCodecContext * avctx, void *data, int *data_size, if (s->input_buffer) { /* copy input buffer to decoder context to avoid reading past the end of the buffer, which can be caused by a damaged input stream. */ - memcpy(s->input_buffer, buf, FFMIN(buf_size, AC3_MAX_FRAME_SIZE)); + memcpy(s->input_buffer, buf, FFMIN(buf_size, AC3_FRAME_BUFFER_SIZE)); init_get_bits(&s->gbc, s->input_buffer, buf_size * 8); } else { init_get_bits(&s->gbc, buf, buf_size * 8); |