Mercurial > libavcodec.hg
diff parser.c @ 2270:21f450be6cb5 libavcodec
lowres width/height cleanup 3rd try
| author | michael |
|---|---|
| date | Mon, 27 Sep 2004 11:50:56 +0000 |
| parents | 535b7dfee202 |
| children | d02fb928ca44 |
line wrap: on
line diff
--- a/parser.c Mon Sep 27 10:06:10 2004 +0000 +++ b/parser.c Mon Sep 27 11:50:56 2004 +0000 @@ -299,8 +299,7 @@ if (bytes_left >= 4) { pc->width = (buf[0] << 4) | (buf[1] >> 4); pc->height = ((buf[1] & 0x0f) << 8) | buf[2]; - avctx->width = -((-pc->width )>>avctx->lowres); - avctx->height = -((-pc->height)>>avctx->lowres); + avcodec_set_dimensions(avctx, pc->width, pc->height); frame_rate_index = buf[3] & 0xf; pc->frame_rate = avctx->frame_rate = frame_rate_tab[frame_rate_index]; avctx->frame_rate_base = MPEG1_FRAME_RATE_BASE; @@ -322,8 +321,7 @@ pc->width |=(horiz_size_ext << 12); pc->height |=( vert_size_ext << 12); - avctx->width = -((-pc->width )>>avctx->lowres); - avctx->height = -((-pc->height)>>avctx->lowres); + avcodec_set_dimensions(avctx, pc->width, pc->height); avctx->frame_rate = pc->frame_rate * (frame_rate_ext_n + 1); avctx->frame_rate_base = MPEG1_FRAME_RATE_BASE * (frame_rate_ext_d + 1); avctx->codec_id = CODEC_ID_MPEG2VIDEO; @@ -441,8 +439,7 @@ init_get_bits(gb, buf, 8 * buf_size); ret = ff_mpeg4_decode_picture_header(s, gb); if (s->width) { - avctx->width = -((-s->width )>>avctx->lowres); - avctx->height = -((-s->height)>>avctx->lowres); + avcodec_set_dimensions(avctx, s->width, s->height); } pc->first_picture = 0; return ret;
