This fixes ticket #3839.
--
Christophe
From 3745a3b611159f6a373785b67cbc92d4b36af44b Mon Sep 17 00:00:00 2001
From: Christophe Gisquet <[email protected]>
Date: Sun, 10 Aug 2014 11:43:12 +0200
Subject: [PATCH] hevc: fix incorrect sao buffer size
It previously used the output, cropped size, causing overreads/writes.
Fixes ticket #3839.
---
libavcodec/hevc.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index b698687..abe1a3d 100644
--- a/libavcodec/hevc.c
+++ b/libavcodec/hevc.c
@@ -280,16 +280,16 @@ static int get_buffer_sao(HEVCContext *s, AVFrame *frame, const HEVCSPS *sps)
{
int ret, i;
- frame->width = s->avctx->width + 2;
- frame->height = s->avctx->height + 2;
+ frame->width = s->avctx->coded_width + 2;
+ frame->height = s->avctx->coded_height + 2;
if ((ret = ff_get_buffer(s->avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0)
return ret;
for (i = 0; frame->data[i]; i++) {
int offset = frame->linesize[i] + (1 << sps->pixel_shift);
frame->data[i] += offset;
}
- frame->width = s->avctx->width;
- frame->height = s->avctx->height;
+ frame->width = s->avctx->coded_width;
+ frame->height = s->avctx->coded_height;
return 0;
}
--
1.9.2.msysgit.0
_______________________________________________
ffmpeg-devel mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
