RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-18 12:56:56 +00:00
Code Issues Projects Releases Wiki Activity

30l: when reading mb_offset in RV30 slice header its size

Browse Source 
should be calculated from current frame dimensions

Originally committed as revision 16536 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Kostya Shishkov 2009-01-11 10:50:00 +00:00
parent 87609b51da
commit 42b7678d65
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/rv30.c
View File

@ -51,13 +51,12 @@ static int rv30_parse_slice_header(RV34DecContext *r, GetBitContext *gb, SliceIn
skip_bits1(gb);
si->pts = get_bits(gb, 13);
rpr = get_bits(gb, r->rpr);
if(!rpr){
si->width = w;
si->height = h;
}else{
si->width = r->s.avctx->extradata[6 + rpr*2] << 2;
si->height = r->s.avctx->extradata[7 + rpr*2] << 2;
if(rpr){
w = r->s.avctx->extradata[6 + rpr*2] << 2;
h = r->s.avctx->extradata[7 + rpr*2] << 2;
}
si->width = w;
si->height = h;
mb_size = ((w + 15) >> 4) * ((h + 15) >> 4);
mb_bits = ff_rv34_get_start_offset(gb, mb_size);
si->start = get_bits(gb, mb_bits);