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/eatgv.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/eatgv.c')
| -rw-r--r-- | libavcodec/eatgv.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/eatgv.c b/libavcodec/eatgv.c index 69e74ca2a4..c986c14e64 100644 --- a/libavcodec/eatgv.c +++ b/libavcodec/eatgv.c @@ -301,8 +301,7 @@ static int tgv_decode_frame(AVCodecContext *avctx, s->frame.buffer_hints = FF_BUFFER_HINTS_VALID; s->frame.linesize[0] = s->width; - /* allocate additional 12 bytes to accommodate av_memcpy_backptr() OUTBUF_PADDED optimisation */ - s->frame.data[0] = av_malloc(s->width*s->height + 12); + s->frame.data[0] = av_malloc(s->width * s->height); if (!s->frame.data[0]) return AVERROR(ENOMEM); s->frame.data[1] = av_malloc(AVPALETTE_SIZE); |