virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-23 04:24:35 +02:00
Code Issues Releases Activity

fix crash on height < 16 pixels.

Browse Source 
Originally committed as revision 4904 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Loren Merritt 2006-01-28 00:57:59 +00:00
parent 7e41c35436
commit fdb52bccf6
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/mpegvideo.c
View File

@ -613,7 +613,9 @@ int MPV_common_init(MpegEncContext *s)
{ {
int y_size, c_size, yc_size, i, mb_array_size, mv_table_size, x, y; int y_size, c_size, yc_size, i, mb_array_size, mv_table_size, x, y;
if(s->avctx->thread_count > MAX_THREADS || (16*s->avctx->thread_count > s->height && s->height)){ s->mb_height = (s->height + 15) / 16;
if(s->avctx->thread_count > MAX_THREADS || (s->avctx->thread_count > s->mb_height && s->mb_height)){
av_log(s->avctx, AV_LOG_ERROR, "too many threads\n"); av_log(s->avctx, AV_LOG_ERROR, "too many threads\n");
return -1; return -1;
} }
@ -628,7 +630,6 @@ int MPV_common_init(MpegEncContext *s)
s->flags2= s->avctx->flags2; s->flags2= s->avctx->flags2;
s->mb_width = (s->width + 15) / 16; s->mb_width = (s->width + 15) / 16;
s->mb_height = (s->height + 15) / 16;
s->mb_stride = s->mb_width + 1; s->mb_stride = s->mb_width + 1;
s->b8_stride = s->mb_width*2 + 1; s->b8_stride = s->mb_width*2 + 1;
s->b4_stride = s->mb_width*4 + 1; s->b4_stride = s->mb_width*4 + 1;