mplayer-on2flix.patch

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