- up to 20140910 snap

[packages/mplayer.git] / mplayer-on2flix.patch

--- mplayer-1.0_rc2_p27725/version.sh~	2008-11-23 20:34:23.000000000 +0200
+++ mplayer-1.0_rc2_p27725/version.sh	2008-11-23 20:34:25.547985245 +0200
@@ -9,7 +9,7 @@
 
 NEW_REVISION="#define VERSION \"dev-SVN-r${svn_revision}${extra}\""
 OLD_REVISION=`cat version.h 2> /dev/null`
-TITLE="#define MP_TITLE \"MPlayer dev-SVN-r${svn_revision}${extra} (C) 2000-2008 MPlayer Team\""
+TITLE="#define MP_TITLE \"MPlayer dev-SVN-on2-r${svn_revision}${extra} (C) 2000-2008 MPlayer Team\""
 
 # Update version.h only on revision changes to avoid spurious rebuilds
 if test "$NEW_REVISION" != "$OLD_REVISION"; then
--- mplayer-1.0_rc2_p27725/mencoder-on2flixenglinux/patch/mencoder_05_mov_lavf_pts_var_fps.diff~	2008-09-30 17:48:23.000000000 +0300
+++ mplayer-1.0_rc2_p27725/mencoder-on2flixenglinux/patch/mencoder_05_mov_lavf_pts_var_fps.diff	2008-11-23 20:42:01.869189287 +0200
@@ -1,15 +1,12 @@
-Index: libmpdemux/video.c
-===================================================================
---- libmpdemux/video.c	(revision 27474)
-+++ libmpdemux/video.c	(working copy)
-@@ -587,7 +587,9 @@
-       }
+--- libmpdemux/video.c~	2008-11-23 20:35:08.000000000 +0200
++++ libmpdemux/video.c	2008-11-23 20:39:05.232123918 +0200
+@@ -588,7 +588,8 @@
        break;
        case DEMUXER_TYPE_LAVF:
+       case DEMUXER_TYPE_LAVF_PREFERRED:
 -        if((int)sh_video->fps==1000 || (int)sh_video->fps<=1){
-+      case DEMUXER_TYPE_LAVF_PREFERRED:
-+        if((int)sh_video->fps==1000 || (int)sh_video->fps<=1 
-+            || sh_video->video.dwRate==1000) {          
++        if((int)sh_video->fps==1000 || (int)sh_video->fps<=1
++            || sh_video->video.dwRate==1000) {
            double next_pts = ds_get_next_pts(d_video);
            double d= (next_pts != MP_NOPTS_VALUE) ? next_pts - d_video->pts : d_video->pts-pts1;
            if(d>=0){