highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lowres width/height cleanup 3rd try

Browse Source 
Originally committed as revision 3522 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
2004-09-27 11:50:56 +00:00
parent 0b2346d38c
commit 21adafec2a
8 changed files with 54 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/parser.c
View File

@@ -299,8 +299,7 @@ static void mpegvideo_extract_headers(AVCodecParserContext *s,
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 @@ static void mpegvideo_extract_headers(AVCodecParserContext *s,
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 @@ 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->lowres);
avctx->height = -((-s->height)>>avctx->lowres);
avcodec_set_dimensions(avctx, s->width, s->height);
}
pc->first_picture = 0;
return ret;