OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ee715f4
)
indeo4: update AVCodecContext width/height on size change
author
Michael Niedermayer
<michaelni@gmx.at>
Sat, 14 Apr 2012 18:04:05 +0000
(20:04 +0200)
committer
Anton Khirnov
<anton@khirnov.net>
Sat, 29 Sep 2012 07:27:32 +0000
(09:27 +0200)
Fixes CVE-2012-2787
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Anton Khirnov <anton@khirnov.net>
libavcodec/ivi_common.c
patch
|
blob
|
history
diff --git
a/libavcodec/ivi_common.c
b/libavcodec/ivi_common.c
index
5ebbf56
..
6ff0f80
100644
(file)
--- a/
libavcodec/ivi_common.c
+++ b/
libavcodec/ivi_common.c
@@
-780,6
+780,7
@@
int ff_ivi_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
avctx->release_buffer(avctx, &ctx->frame);
ctx->frame.reference = 0;
+ avcodec_set_dimensions(avctx, ctx->planes[0].width, ctx->planes[0].height);
if ((result = avctx->get_buffer(avctx, &ctx->frame)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return result;