ffmpeg | branch: release/0.7 | Michael Niedermayer <michae...@gmx.at> | Fri Oct
3 04:30:58 2014 +0200| [cd3c4d8c55222337b0b59af4ea1fecfb46606e5e] | committer:
Michael Niedermayer
avcodec/utils: Add case for jv to avcodec_align_dimensions2()
Fixes out of array accesses
Fixes: asan_heap-oob_12304aa_8_asan_heap-oob_4da4f3_300_intro.jv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michae...@gmx.at>
(cherry picked from commit 105654e376a736d243aef4a1d121abebce912e6b)
Conflicts:
libavcodec/utils.c
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cd3c4d8c55222337b0b59af4ea1fecfb46606e5e
---
libavcodec/utils.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 8eca9c6..27feb53 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -182,6 +182,10 @@ void avcodec_align_dimensions2(AVCodecContext *s, int
*width, int *height, int l
w_align = 4;
h_align = 4;
}
+ if (s->codec_id == CODEC_ID_JV) {
+ w_align = 8;
+ h_align = 8;
+ }
break;
case PIX_FMT_BGR24:
if((s->codec_id == CODEC_ID_MSZH) || (s->codec_id == CODEC_ID_ZLIB)){
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
