Mercurial > libavcodec.hg
changeset 1679:55c03fa692a9 libavcodec
set AVCodecContext.width/height before get_buffer()
| author | michael |
|---|---|
| date | Thu, 11 Dec 2003 11:17:54 +0000 |
| parents | c962b8db3715 |
| children | 6bd7a01eca9c |
| files | mjpeg.c |
| diffstat | 1 files changed, 6 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/mjpeg.c Wed Dec 10 17:05:41 2003 +0000 +++ b/mjpeg.c Thu Dec 11 11:17:54 2003 +0000 @@ -793,7 +793,7 @@ VLC vlcs[2][4]; int qscale[4]; ///< quantizer scale calculated from quant_matrixes - int org_width, org_height; /* size given at codec init */ + int org_height; /* size given at codec init */ int first_picture; /* true if decoding first picture */ int interlaced; /* true if interlaced */ int bottom_field; /* true if bottom field */ @@ -874,7 +874,6 @@ return -1; s->start_code = -1; s->first_picture = 1; - s->org_width = avctx->width; s->org_height = avctx->height; build_vlc(&s->vlcs[0][0], bits_dc_luminance, val_dc_luminance, 12); @@ -1027,13 +1026,17 @@ s->width = width; s->height = height; + s->avctx->width = s->width; + s->avctx->height = s->height; + /* test interlaced mode */ if (s->first_picture && s->org_height != 0 && s->height < ((s->org_height * 3) / 4)) { s->interlaced = 1; // s->bottom_field = (s->interlace_polarity) ? 1 : 0; - s->bottom_field = 0; + s->bottom_field = 0; + s->avctx->height *= 2; } s->qscale_table= av_mallocz((s->width+15)/16); @@ -1818,10 +1821,6 @@ } *picture = s->picture; *data_size = sizeof(AVFrame); - avctx->height = s->height; - if (s->interlaced) - avctx->height *= 2; - avctx->width = s->width; if(!s->lossless){ picture->quality= FFMAX(FFMAX(s->qscale[0], s->qscale[1]), s->qscale[2]); @@ -1976,10 +1975,6 @@ *picture= s->picture; *data_size = sizeof(AVFrame); - avctx->height = s->height; - if (s->interlaced) - avctx->height *= 2; - avctx->width = s->width; if(!s->lossless){ picture->quality= FFMAX(FFMAX(s->qscale[0], s->qscale[1]), s->qscale[2]);