diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2003-12-11 11:17:54 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-12-11 11:17:54 +0000 |
| commit | 5814beaa87ebeb6ee9db49e907858b183aad6f3f (patch) | |
| tree | 937e56c7ca54613cf68d79118c6312d92217e12b /libavcodec | |
| parent | 99db6420f2c9841ad3f4c61feeb73187b5cb290b (diff) | |
| download | ffmpeg-5814beaa87ebeb6ee9db49e907858b183aad6f3f.tar.gz | |
set AVCodecContext.width/height before get_buffer()
Originally committed as revision 2596 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mjpeg.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/libavcodec/mjpeg.c b/libavcodec/mjpeg.c index 78e7630a5c..a8dbc2bbd4 100644 --- a/libavcodec/mjpeg.c +++ b/libavcodec/mjpeg.c @@ -793,7 +793,7 @@ typedef struct MJpegDecodeContext { 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 @@ static int mjpeg_decode_init(AVCodecContext *avctx) 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 @@ static int mjpeg_decode_sof(MJpegDecodeContext *s) 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 @@ eoi_parser: } *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 @@ read_header: *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]); |