[vlc-devel] commit: libmpeg2: user MPEG2 coding type defines when matching to mpeg2 flags. ( Derk-Jan Hartman )

git version control git at videolan.org
Sun Sep 28 18:12:22 CEST 2008


vlc | branch: master | Derk-Jan Hartman <hartman at videolan.org> | Sun Sep 28 17:36:32 2008 +0200| [ec15067d08073b961e9aebe5884e624f124abcb9] | committer: 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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ec15067d08073b961e9aebe5884e624f124abcb9
---

 modules/codec/libmpeg2.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/codec/libmpeg2.c b/modules/codec/libmpeg2.c
index 391ce67..dc40199 100644
--- a/modules/codec/libmpeg2.c
+++ b/modules/codec/libmpeg2.c
@@ -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 );
             }




More information about the vlc-devel mailing list