Commit ec15067d authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

libmpeg2: user MPEG2 coding type defines when matching to mpeg2 flags.

Though the values are the same, this is cleaner, and more 'future' proof
parent 5fdc56db
...@@ -426,7 +426,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) ...@@ -426,7 +426,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
if( !p_dec->b_pace_control && !p_sys->b_preroll && if( !p_dec->b_pace_control && !p_sys->b_preroll &&
!(p_sys->b_slice_i !(p_sys->b_slice_i
&& ((p_sys->p_info->current_picture->flags && ((p_sys->p_info->current_picture->flags
& PIC_MASK_CODING_TYPE) == P_CODING_TYPE)) & PIC_MASK_CODING_TYPE) == PIC_FLAG_CODING_TYPE_P))
&& !decoder_SynchroChoose( p_sys->p_synchro, && !decoder_SynchroChoose( p_sys->p_synchro,
p_sys->p_info->current_picture->flags p_sys->p_info->current_picture->flags
& PIC_MASK_CODING_TYPE, & PIC_MASK_CODING_TYPE,
...@@ -526,7 +526,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) ...@@ -526,7 +526,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
msg_Warn( p_dec, "invalid picture encountered" ); msg_Warn( p_dec, "invalid picture encountered" );
if ( ( p_sys->p_info->current_picture == NULL ) || if ( ( p_sys->p_info->current_picture == NULL ) ||
( ( p_sys->p_info->current_picture->flags & ( ( p_sys->p_info->current_picture->flags &
PIC_MASK_CODING_TYPE) != B_CODING_TYPE ) ) PIC_MASK_CODING_TYPE) != PIC_FLAG_CODING_TYPE_B ) )
{ {
if( p_sys->p_synchro ) decoder_SynchroReset( p_sys->p_synchro ); if( p_sys->p_synchro ) decoder_SynchroReset( p_sys->p_synchro );
} }
......
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