# HG changeset patch # User michael # Date 1096255046 0 # Node ID 143c17950b55557df30a6f38178194ae142a384a # Parent 514949de5d15a0a1fd4dee1ac6e60562b5e15f91 10l diff -r 514949de5d15 -r 143c17950b55 mjpeg.c --- a/mjpeg.c Mon Sep 27 02:39:55 2004 +0000 +++ b/mjpeg.c Mon Sep 27 03:17:26 2004 +0000 @@ -859,8 +859,8 @@ MpegEncContext s2; s->avctx = avctx; - avctx->width = -((-avctx->width )) >> avctx->lowres; - avctx->height= -((-avctx->height)) >> avctx->lowres; + avctx->width = -((-avctx->width ) >> avctx->lowres); + avctx->height= -((-avctx->height) >> avctx->lowres); /* ugly way to get the idct & scantable FIXME */ memset(&s2, 0, sizeof(MpegEncContext)); @@ -2070,8 +2070,10 @@ #else /* SOF */ s->bits = 8; - s->width = avctx->width << avctx->lowres; - s->height = avctx->height<< avctx->lowres; + s->width = avctx->width; + s->height = avctx->height; + avctx->width = -((-avctx->width )>>avctx->lowres); + avctx->height = -((-avctx->height)>>avctx->lowres); s->nb_components = 3; s->component_id[0] = 0; s->h_count[0] = 2;