[Mplayerxp-cvslog] CVS: mplayerxp/mplayerxp/libmpdemux demuxer_r.c,1.17,1.18 video.c,1.22,1.23

[Nick K. <nic...@us...>]

Update of /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpdemux
In directory sc8-pr-cvs1:/tmp/cvs-serv13912

Modified Files:
	demuxer_r.c video.c 
Log Message:
don't shadow alternative way to fix pts

Index: demuxer_r.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpdemux/demuxer_r.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -p -u -d -r1.17 -r1.18
--- demuxer_r.c	8 May 2003 07:34:41 -0000	1.17
+++ demuxer_r.c	9 May 2003 05:48:04 -0000	1.18
@@ -19,6 +19,7 @@ extern int benchmark;
 extern float initial_audio_pts;
 extern int av_force_pts_fix;
 extern int av_sync_pts;
+extern int av_force_pts_fix2;
 
 static float get_ds_stream_pts(demux_stream_t *ds,int nbytes)
 {
@@ -36,8 +37,7 @@ static float get_ds_stream_pts(demux_str
 	demuxer->file_format == DEMUXER_TYPE_H264_ES ||
 	demuxer->file_format == DEMUXER_TYPE_MPEG_PS ||
 	demuxer->file_format == DEMUXER_TYPE_MPEG_TS ||
-	av_force_pts_fix) &&
-	av_sync_pts)
+	av_force_pts_fix) && av_sync_pts && av_force_pts_fix2!=1)
     {
 	if(ds->pts_flags && ds->pts < 1.0 && ds->prev_pts > 2.0) { ds->pts_corr=ds->prev_pts; ds->pts_flags=0; MSG_V("correct audio %f pts as %f\n",ds->pts,ds->pts_corr); }
 	if(ds->pts>1.0) ds->pts_flags=1;

Index: video.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpdemux/video.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -p -u -d -r1.22 -r1.23
--- video.c	8 May 2003 07:34:41 -0000	1.22
+++ video.c	9 May 2003 05:48:04 -0000	1.23
@@ -271,6 +271,8 @@ static void process_userdata(unsigned ch
 
 extern int av_force_pts_fix;
 extern int av_sync_pts;
+extern int av_force_pts_fix2;
+
 int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,float *v_pts,unsigned char** start,int force_fps){
     demux_stream_t *d_video=sh_video->ds;
     demuxer_t *demuxer=d_video->demuxer;
@@ -416,8 +418,7 @@ int video_read_frame(sh_video_t* sh_vide
 	demuxer->file_format == DEMUXER_TYPE_H264_ES ||
 	demuxer->file_format == DEMUXER_TYPE_MPEG_PS ||
 	demuxer->file_format == DEMUXER_TYPE_MPEG_TS ||
-	av_force_pts_fix) &&
-	av_sync_pts)
+	av_force_pts_fix) && av_sync_pts && av_force_pts_fix2!=1)
     {
 	if(d_video->pts_flags && d_video->pts < 1.0 && d_video->prev_pts > 2.0) { d_video->pts_corr=d_video->prev_pts; d_video->pts_flags=0; MSG_V("correcting video %f pts as %f\n",d_video->pts,d_video->pts_corr); }
 	if(d_video->pts>1.0) d_video->pts_flags=1;