Commit 4746e4bc authored by Laurent Aimar's avatar Laurent Aimar

Fixed seeking in mpeg1 files with libmpeg2 decoder (close #2953).

mpeg1 files may have only one sequence header.

It can be backported to 1.0 only after being carefully tested.
parent bead3397
...@@ -395,8 +395,14 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) ...@@ -395,8 +395,14 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
if( !p_pic ) if( !p_pic )
{ {
Reset( p_dec ); Reset( p_dec );
block_Release( p_block );
return NULL; p_pic = DpbNewPicture( p_dec );
if( !p_pic )
{
mpeg2_reset( p_sys->p_mpeg2dec, 1 );
block_Release( p_block );
return NULL;
}
} }
} }
...@@ -614,7 +620,7 @@ static void Reset( decoder_t *p_dec ) ...@@ -614,7 +620,7 @@ static void Reset( decoder_t *p_dec )
decoder_sys_t *p_sys = p_dec->p_sys; decoder_sys_t *p_sys = p_dec->p_sys;
cc_Flush( &p_sys->cc ); cc_Flush( &p_sys->cc );
mpeg2_reset( p_sys->p_mpeg2dec, p_sys->p_info->sequence != NULL ); mpeg2_reset( p_sys->p_mpeg2dec, 0 );
DpbClean( p_dec ); DpbClean( p_dec );
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment