diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2004-09-27 03:17:26 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-09-27 03:17:26 +0000 |
| commit | f1cc95f0e999c3183ccd3aa9b2cc37aa5b535103 (patch) | |
| tree | ca7a2942c08f6b3c832b9775929797f4f06d89c9 /libavcodec/mjpeg.c | |
| parent | 4f8a831994889f2a90669dc230c14d203d52083d (diff) | |
10l
Originally committed as revision 3519 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mjpeg.c')
| -rw-r--r-- | libavcodec/mjpeg.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libavcodec/mjpeg.c b/libavcodec/mjpeg.c index ba056184db..19c3b6b09a 100644 --- a/libavcodec/mjpeg.c +++ b/libavcodec/mjpeg.c @@ -859,8 +859,8 @@ static int mjpeg_decode_init(AVCodecContext *avctx) 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 @@ static int sp5x_decode_frame(AVCodecContext *avctx, #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; |