generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests 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>
(cherry picked from commit f5c00b347d)

Conflicts:

	libavcodec/utils.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 2b6f3be082)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-02-20 02:24:30 +01:00
parent c2d3f06882
commit 5f5bf9faf9
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/utils.c
View File

@@ -165,9 +165,10 @@ void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height){
case PIX_FMT_PAL8: case PIX_FMT_PAL8:
case PIX_FMT_BGR8: case PIX_FMT_BGR8:
case PIX_FMT_RGB8: case PIX_FMT_RGB8:
if(s->codec_id == CODEC_ID_SMC){ if (s->codec_id == CODEC_ID_SMC ||
w_align=4; s->codec_id == CODEC_ID_CINEPAK) {
h_align=4; w_align = 4;
h_align = 4;
} }
break; break;
case PIX_FMT_BGR24: case PIX_FMT_BGR24:
@@ -176,6 +177,12 @@ void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height){
h_align=4; h_align=4;
} }
break; break;
case PIX_FMT_RGB24:
if (s->codec_id == CODEC_ID_CINEPAK) {
w_align = 4;
h_align = 4;
}
break;
default: default:
w_align= 1; w_align= 1;
h_align= 1; h_align= 1;