highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec_align_dimensions2: Ensure cinepak has large enough buffers.

Browse Source 
This is partly redundant with the following patches, but its safer

Found-by: u-bo1b@0w.se
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-02-20 02:24:30 +01:00
parent 2b10d41464
commit f5c00b347d
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/utils.c
View File

@@ -267,7 +267,8 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
case AV_PIX_FMT_PAL8: case AV_PIX_FMT_PAL8:
case AV_PIX_FMT_BGR8: case AV_PIX_FMT_BGR8:
case AV_PIX_FMT_RGB8: case AV_PIX_FMT_RGB8:
if (s->codec_id == AV_CODEC_ID_SMC) { if (s->codec_id == AV_CODEC_ID_SMC ||
s->codec_id == AV_CODEC_ID_CINEPAK) {
w_align = 4; w_align = 4;
h_align = 4; h_align = 4;
} }
@@ -279,6 +280,12 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
h_align = 4; h_align = 4;
} }
break; break;
case AV_PIX_FMT_RGB24:
if (s->codec_id == AV_CODEC_ID_CINEPAK) {
w_align = 4;
h_align = 4;
}
break;
default: default:
w_align = 1; w_align = 1;
h_align = 1; h_align = 1;