ffmpeg | branch: release/2.4 | Michael Niedermayer <michae...@gmx.at> | Tue Jun
30 19:37:12 2015 +0200| [47a5cde6ac03476a4eec08e2cc56cf633bc7582b] | committer:
Michael Niedermayer
avcodec/h264_slice: Use w/h from the AVFrame instead of mb_w/h
Fixes out of array access
Fixes:
asan_heap-oob_4d5bb0_682_cov_3124593265_Fraunhofer__a_driving_force_in_innovation__small.mp4
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michae...@gmx.at>
(cherry picked from commit 330863c9f19a23c500ba7901a23f1cc377b353bb)
Conflicts:
libavcodec/h264_slice.c
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=47a5cde6ac03476a4eec08e2cc56cf633bc7582b
---
libavcodec/h264_slice.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index ade642f..3b50114 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -1699,8 +1699,8 @@ int ff_h264_decode_slice_header(H264Context *h,
H264Context *h0)
(const uint8_t **)prev->f.data,
prev->f.linesize,
prev->f.format,
- h->mb_width * 16,
- h->mb_height * 16);
+ prev->f.width,
+ prev->f.height);
h->short_ref[0]->poc = prev->poc + 2;
}
h->short_ref[0]->frame_num = h->prev_frame_num;
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
