diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2004-09-27 10:06:10 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-09-27 10:06:10 +0000 |
| commit | 0b2346d38c96cbc218cb75e8f83eec788cd1bc29 (patch) | |
| tree | 73778b4e9ff3623a57fb44574c21de04da449b2e /libavcodec | |
| parent | 8b392ae2e7c3982e6a7215e4d81b9191c6793c71 (diff) | |
| download | ffmpeg-0b2346d38c96cbc218cb75e8f83eec788cd1bc29.tar.gz | |
lowres fixes for the parser
Originally committed as revision 3521 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/parser.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/libavcodec/parser.c b/libavcodec/parser.c index 7d84401e51..4f82edab55 100644 --- a/libavcodec/parser.c +++ b/libavcodec/parser.c @@ -297,8 +297,10 @@ static void mpegvideo_extract_headers(AVCodecParserContext *s, break; case SEQ_START_CODE: if (bytes_left >= 4) { - pc->width = avctx->width = (buf[0] << 4) | (buf[1] >> 4); - pc->height = avctx->height = ((buf[1] & 0x0f) << 8) | buf[2]; + 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); 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; @@ -318,8 +320,10 @@ static void mpegvideo_extract_headers(AVCodecParserContext *s, frame_rate_ext_d = (buf[5] & 0x1f); pc->progressive_sequence = buf[1] & (1 << 3); - avctx->width = pc->width | (horiz_size_ext << 12); - avctx->height = pc->height | (vert_size_ext << 12); + pc->width |=(horiz_size_ext << 12); + pc->height |=( vert_size_ext << 12); + avctx->width = -((-pc->width )>>avctx->lowres); + avctx->height = -((-pc->height)>>avctx->lowres); 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; @@ -437,8 +441,8 @@ static int av_mpeg4_decode_header(AVCodecParserContext *s1, init_get_bits(gb, buf, 8 * buf_size); ret = ff_mpeg4_decode_picture_header(s, gb); if (s->width) { - avctx->width = s->width; - avctx->height = s->height; + avctx->width = -((-s->width )>>avctx->lowres); + avctx->height = -((-s->height)>>avctx->lowres); } pc->first_picture = 0; return ret; |