]> git.sesse.net Git - vlc/commitdiff
libmpeg2: user MPEG2 coding type defines when matching to mpeg2 flags.
authorDerk-Jan Hartman <hartman@videolan.org>
Sun, 28 Sep 2008 15:36:32 +0000 (17:36 +0200)
committerDerk-Jan Hartman <hartman@videolan.org>
Sun, 28 Sep 2008 16:05:17 +0000 (18:05 +0200)
Though the values are the same, this is cleaner, and more 'future' proof

modules/codec/libmpeg2.c

index 391ce671407edef65e8656a2dde4ff34dfaf826b..dc40199cb65e1f022d4b15aae2e66e7058147065 100644 (file)
@@ -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 &&
                 !(p_sys->b_slice_i
                    && ((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,
                               p_sys->p_info->current_picture->flags
                                 & PIC_MASK_CODING_TYPE,
@@ -526,7 +526,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
             msg_Warn( p_dec, "invalid picture encountered" );
             if ( ( p_sys->p_info->current_picture == NULL ) ||
                ( ( 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 );
             }