assign picture->(width,height) when parsing h264

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15074 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
nicodvb 2005-04-09 11:00:00 +00:00
parent 3095df2c6a
commit f1a9cf6c69
1 changed files with 7 additions and 4 deletions

View File

@ -297,8 +297,9 @@ static int h264_parse_vui(mp_mpeg_header_t * picture, unsigned char * buf, unsig
int h264_parse_sps(mp_mpeg_header_t * picture, unsigned char * buf, int len)
{
unsigned int n = 0, m = 0, v, i, j;
unsigned int n = 0, v, i, j, mbh;
unsigned char *dest;
int frame_mbs_only;
dest = (unsigned char*) malloc(len);
if(! dest)
@ -343,9 +344,11 @@ int h264_parse_sps(mp_mpeg_header_t * picture, unsigned char * buf, int len)
}
read_golomb(buf, &n);
getbits(buf, n++, 1);
read_golomb(buf, &n);
read_golomb(buf, &n);
if(!getbits(buf, n++, 1))
picture->display_picture_width = 16 *(read_golomb(buf, &n)+1);
mbh = read_golomb(buf, &n)+1;
frame_mbs_only = getbits(buf, n++, 1);
picture->display_picture_height = 16 * (2 - frame_mbs_only) * mbh;
if(!frame_mbs_only)
getbits(buf, n++, 1);
getbits(buf, n++, 1);
if(getbits(buf, n++, 1))