Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv5828/libmpdemux Modified Files: demux_ts.c Log Message: big demux_ts fix from Nico <nsabbi@libero.it> Index: demux_ts.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ts.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- demux_ts.c 8 Sep 2003 10:07:52 -0000 1.10 +++ demux_ts.c 20 Oct 2003 13:35:55 -0000 1.11 @@ -34,6 +34,7 @@ #include "stheader.h" #include "bswap.h" +#include "../unrarlib.h" #define TS_FEC_PACKET_SIZE 204 @@ -42,12 +43,15 @@ #define MAX_HEADER_SIZE 6 /* enough for PES header + length */ #define MAX_CHECK_SIZE 65535 [...1776 lines suppressed...] if(sh_video != NULL) ds_fill_buffer(d_video); @@ -1717,7 +2116,7 @@ { float a_pts=d_audio->pts; a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps; - if(d_video->pts>a_pts) + if(d_video->pts > a_pts) { skip_audio_frame(sh_audio); // sync audio continue; @@ -1726,7 +2125,7 @@ i = sync_video_packet(d_video); - if(sh_video->format == VIDEO_MPEG1 || sh_video->format == VIDEO_MPEG2) + if((sh_video->format == VIDEO_MPEG1) || (sh_video->format == VIDEO_MPEG2)) { if(i==0x1B3 || i==0x1B8) break; // found it! }