virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity

10l

Browse Source 
Originally committed as revision 3519 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2004-09-27 03:17:26 +00:00
parent 4f8a831994
commit f1cc95f0e9
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/mjpeg.c
View File

@ -859,8 +859,8 @@ static int mjpeg_decode_init(AVCodecContext *avctx)
MpegEncContext s2; MpegEncContext s2;
s->avctx = avctx; s->avctx = avctx;
avctx->width = -((-avctx->width )) >> avctx->lowres; avctx->width = -((-avctx->width ) >> avctx->lowres);
avctx->height= -((-avctx->height)) >> avctx->lowres; avctx->height= -((-avctx->height) >> avctx->lowres);
/* ugly way to get the idct & scantable FIXME */ /* ugly way to get the idct & scantable FIXME */
memset(&s2, 0, sizeof(MpegEncContext)); memset(&s2, 0, sizeof(MpegEncContext));
@ -2070,8 +2070,10 @@ static int sp5x_decode_frame(AVCodecContext *avctx,
#else #else
/* SOF */ /* SOF */
s->bits = 8; s->bits = 8;
s->width = avctx->width << avctx->lowres; s->width = avctx->width;
s->height = avctx->height<< avctx->lowres; s->height = avctx->height;
avctx->width = -((-avctx->width )>>avctx->lowres);
avctx->height = -((-avctx->height)>>avctx->lowres);
s->nb_components = 3; s->nb_components = 3;
s->component_id[0] = 0; s->component_id[0] = 0;
s->h_count[0] = 2; s->h_count[0] = 2;