[MPlayer-cvslog] r24864 - trunk/libmpdemux/video.c

[nicodvb]

Author: nicodvb
Date: Sat Oct 27 14:39:53 2007
New Revision: 24864

Log:
replaced giant if() with if(pre-calculated variable) (there was even a bug: PS doesn't necessarily contain mpeg12)

Modified:
   trunk/libmpdemux/video.c

Modified: trunk/libmpdemux/video.c
==============================================================================
--- trunk/libmpdemux/video.c	(original)
+++ trunk/libmpdemux/video.c	Sat Oct 27 14:39:53 2007
@@ -611,11 +611,7 @@ int video_read_frame(sh_video_t* sh_vide
       break;
     }
 
-    if(demuxer->file_format==DEMUXER_TYPE_MPEG_PS ||
-       demuxer->file_format==DEMUXER_TYPE_MPEG_PES ||
-       ((demuxer->file_format==DEMUXER_TYPE_MPEG_TS) && ((sh_video->format==0x10000001) || (sh_video->format==0x10000002))) ||
-       demuxer->file_format==DEMUXER_TYPE_MPEG_ES ||
-       demuxer->file_format==DEMUXER_TYPE_MPEG_TY){
+    if(video_codec == VIDEO_MPEG12){
 
 
         sh_video->pts+=frame_time;