mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-29 00:10:04 +02:00
fix decoding of bastard1.rm (rv ver=0x10003001 ver0=0x8000000)
Originally committed as revision 6346 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
730ba4067c
commit
e2887363e1
@ -594,7 +594,7 @@ static int rv10_decode_packet(AVCodecContext *avctx,
|
|||||||
uint8_t *buf, int buf_size)
|
uint8_t *buf, int buf_size)
|
||||||
{
|
{
|
||||||
MpegEncContext *s = avctx->priv_data;
|
MpegEncContext *s = avctx->priv_data;
|
||||||
int mb_count, mb_pos, left;
|
int mb_count, mb_pos, left, start_mb_x;
|
||||||
|
|
||||||
init_get_bits(&s->gb, buf, buf_size*8);
|
init_get_bits(&s->gb, buf, buf_size*8);
|
||||||
if(s->codec_id ==CODEC_ID_RV10)
|
if(s->codec_id ==CODEC_ID_RV10)
|
||||||
@ -639,8 +639,9 @@ static int rv10_decode_packet(AVCodecContext *avctx,
|
|||||||
if(s->mb_y==0) s->first_slice_line=1;
|
if(s->mb_y==0) s->first_slice_line=1;
|
||||||
}else{
|
}else{
|
||||||
s->first_slice_line=1;
|
s->first_slice_line=1;
|
||||||
}
|
|
||||||
s->resync_mb_x= s->mb_x;
|
s->resync_mb_x= s->mb_x;
|
||||||
|
}
|
||||||
|
start_mb_x= s->mb_x;
|
||||||
s->resync_mb_y= s->mb_y;
|
s->resync_mb_y= s->mb_y;
|
||||||
if(s->h263_aic){
|
if(s->h263_aic){
|
||||||
s->y_dc_scale_table=
|
s->y_dc_scale_table=
|
||||||
@ -699,7 +700,7 @@ static int rv10_decode_packet(AVCodecContext *avctx,
|
|||||||
if(ret == SLICE_END) break;
|
if(ret == SLICE_END) break;
|
||||||
}
|
}
|
||||||
|
|
||||||
ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, AC_END|DC_END|MV_END);
|
ff_er_add_slice(s, start_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, AC_END|DC_END|MV_END);
|
||||||
|
|
||||||
return buf_size;
|
return buf_size;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user