diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-24 14:18:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-24 14:18:17 +0200 |
| commit | 719fde47ca641edd4321f384579438f930bc50eb (patch) | |
| tree | 577820b177126467a82a115aebf759cd04611d78 /libavcodec/lcldec.c | |
| parent | 5cf794e0c1f7b651de4b1a61a6786fb71e9679b3 (diff) | |
| parent | c68317ebbe4915035df0b08c23eea7a0b80ab881 (diff) | |
| download | ffmpeg-719fde47ca641edd4321f384579438f930bc50eb.tar.gz | |
Merge commit 'c68317ebbe4915035df0b08c23eea7a0b80ab881'
* commit 'c68317ebbe4915035df0b08c23eea7a0b80ab881':
lavc: fix documentation for AVCodecContext.delay
atrac3: return an error if extradata_size is not a specific known size
lavc: use the correct API version guard macro for avcodec_encode_audio()
Move Doxyfile into the doc/ subdirectory
doxygen: Build Doxygen documentation in the doc/ subdirectory
dfa: use av_memcpy_backptr() where previously impossible
av_memcpy_backptr: Drop no longer necessary malloc padding
Conflicts:
.gitignore
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/lcldec.c')
| -rw-r--r-- | libavcodec/lcldec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c index ab188e28da..475ffdd55a 100644 --- a/libavcodec/lcldec.c +++ b/libavcodec/lcldec.c @@ -482,7 +482,8 @@ static av_cold int decode_init(AVCodecContext *avctx) { LclDecContext * const c = avctx->priv_data; unsigned int basesize = avctx->width * avctx->height; - unsigned int max_basesize = FFALIGN(avctx->width, 4) * FFALIGN(avctx->height, 4) + AV_LZO_OUTPUT_PADDING; + unsigned int max_basesize = FFALIGN(avctx->width, 4) * + FFALIGN(avctx->height, 4); unsigned int max_decomp_size; avcodec_get_frame_defaults(&c->pic); |