[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[546] mplayerxp

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

Revision: 546
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=546&view=rev
Author:   nickols_k
Date:     2012-12-11 17:07:00 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
cleanups

Modified Paths:
--------------
    mplayerxp/libmpcodecs/dec_video.cpp
    mplayerxp/libmpcodecs/vd_lavc.cpp
    mplayerxp/postproc/vf.cpp
    mplayerxp/postproc/vf_vo2.cpp

Modified: mplayerxp/libmpcodecs/dec_video.cpp
===================================================================
--- mplayerxp/libmpcodecs/dec_video.cpp	2012-12-11 17:04:33 UTC (rev 545)
+++ mplayerxp/libmpcodecs/dec_video.cpp	2012-12-11 17:07:00 UTC (rev 546)
@@ -527,7 +527,7 @@
 	    vf_prepend_filter(s,"palette",&conf);
 	    goto csp_again;
 	} else {
-	// sws failed, if the last filter (vf_vo) support MPEGPES try to append vf_lavc
+	// sws failed, if the last filter (vf_vo2) support MPEGPES try to append vf_lavc
 	    // Remove the scale filter if we added it ourself
 	    if(strcmp(vf_get_first_name(s),"fmtcvt")==0) vf_remove_first(s);
 	}

Modified: mplayerxp/libmpcodecs/vd_lavc.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_lavc.cpp	2012-12-11 17:04:33 UTC (rev 545)
+++ mplayerxp/libmpcodecs/vd_lavc.cpp	2012-12-11 17:07:00 UTC (rev 546)
@@ -674,7 +674,7 @@
     else			priv->use_slices=0;
 /*
     if codec is capable DR1
-    if sh->vfilter==vf_vo (DR1 is meaningless into temp buffer)
+    if sh->vfilter==vf_vo2 (DR1 is meaningless into temp buffer)
     It always happens with (vidix+bus mastering), (if (src_w%16==0)) with xv
 */
     has_b_frames=priv->ctx->has_b_frames||

Modified: mplayerxp/postproc/vf.cpp
===================================================================
--- mplayerxp/postproc/vf.cpp	2012-12-11 17:04:33 UTC (rev 545)
+++ mplayerxp/postproc/vf.cpp	2012-12-11 17:07:00 UTC (rev 546)
@@ -54,7 +54,7 @@
 extern const vf_info_t vf_info_swapuv;
 extern const vf_info_t vf_info_test;
 extern const vf_info_t vf_info_unsharp;
-extern const vf_info_t vf_info_vo;
+extern const vf_info_t vf_info_vo2;
 extern const vf_info_t vf_info_yuvcsp;
 extern const vf_info_t vf_info_yuy2;
 extern const vf_info_t vf_info_yvu9;
@@ -96,7 +96,7 @@
     &vf_info_swapuv,
     &vf_info_test,
     &vf_info_unsharp,
-    &vf_info_vo,
+    &vf_info_vo2,
     &vf_info_yuvcsp,
     &vf_info_yuy2,
     &vf_info_yvu9,

Modified: mplayerxp/postproc/vf_vo2.cpp
===================================================================
--- mplayerxp/postproc/vf_vo2.cpp	2012-12-11 17:04:33 UTC (rev 545)
+++ mplayerxp/postproc/vf_vo2.cpp	2012-12-11 17:07:00 UTC (rev 546)
@@ -97,7 +97,7 @@
     dri_surface_cap_t dcaps;
     int rflags;
     uint32_t flags=mpxp_context().video().output->query_format(&fmt,w,h);
-    MSG_DBG2("[vf_vo] %i=query_format(%s)\n",flags,vo_format_name(fmt));
+    MSG_DBG2("[vf_vo2] %i=query_format(%s)\n",flags,vo_format_name(fmt));
     rflags=0;
     UNUSED(vf);
     if(flags) {
@@ -156,7 +156,7 @@
     return MPXP_Ok;
 }
 
-extern const vf_info_t vf_info_vo = {
+extern const vf_info_t vf_info_vo2 = {
     "libvo2 wrapper",
     "vo",
     "A'rpi",

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.