Fixes: out of array access
Fixes: poc_0411
Found-by: GwanYeong Kim <[email protected]>
Tested-by: GwanYeong Kim <[email protected]>
Signed-off-by: Michael Niedermayer <[email protected]>
---
libavcodec/utils.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 8c7d056da6..59d41ccbb6 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -312,7 +312,10 @@ void avcodec_align_dimensions2(AVCodecContext *s, int
*width, int *height,
*width = FFALIGN(*width, w_align);
*height = FFALIGN(*height, h_align);
- if (s->codec_id == AV_CODEC_ID_H264 || s->lowres) {
+ if (s->codec_id == AV_CODEC_ID_H264 || s->lowres ||
+ s->codec_id == AV_CODEC_ID_VP5 || s->codec_id == AV_CODEC_ID_VP6 ||
+ s->codec_id == AV_CODEC_ID_VP6F || s->codec_id == AV_CODEC_ID_VP6A
+ ) {
// some of the optimized chroma MC reads one line too much
// which is also done in mpeg decoders with lowres > 0
*height += 2;
--
2.17.0
_______________________________________________
ffmpeg-devel mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
