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

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

Revision: 408
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=408&view=rev
Author:   nickols_k
Date:     2012-11-18 15:23:42 +0000 (Sun, 18 Nov 2012)
Log Message:
-----------
use universal mp_conf_lavc.h

Modified Paths:
--------------
    mplayerxp/libmpcodecs/dec_video.cpp
    mplayerxp/libmpsub/spudec.cpp
    mplayerxp/libvo/screenshot.cpp
    mplayerxp/libvo/video_out.cpp
    mplayerxp/mplayerxp.cpp

Modified: mplayerxp/libmpcodecs/dec_video.cpp
===================================================================
--- mplayerxp/libmpcodecs/dec_video.cpp	2012-11-18 13:04:09 UTC (rev 407)
+++ mplayerxp/libmpcodecs/dec_video.cpp	2012-11-18 15:23:42 UTC (rev 408)
@@ -32,14 +32,13 @@
 #include "libmpsub/spudec.h"
 #include "libmpsub/vobsub.h"
 
-// ===================================================================
-vf_cfg_t vf_cfg; // Configuration for audio filters
-
-#define UINT64_C __UINT64_C
-#include "postproc/postprocess.h"
+#include "mp_conf_lavc.h"
 #include "osdep/cpudetect.h"
 #include "vd_msg.h"
 
+// ===================================================================
+vf_cfg_t vf_cfg; // Configuration for audio filters
+
 extern int v_bright;
 extern int v_cont;
 extern int v_hue;

Modified: mplayerxp/libmpsub/spudec.cpp
===================================================================
--- mplayerxp/libmpsub/spudec.cpp	2012-11-18 13:04:09 UTC (rev 407)
+++ mplayerxp/libmpsub/spudec.cpp	2012-11-18 15:23:42 UTC (rev 408)
@@ -23,10 +23,7 @@
 
 #include "xmpcore/xmp_core.h"
 #include "spudec.h"
-extern "C" {
-#define UINT64_C __UINT64_C
-#include "postproc/swscale.h"
-}
+#include "mp_conf_lavc.h"
 #include "osdep/mplib.h"
 #define MSGT_CLASS MSGT_SPUDEC
 #include "mp_msg.h"

Modified: mplayerxp/libvo/screenshot.cpp
===================================================================
--- mplayerxp/libvo/screenshot.cpp	2012-11-18 13:04:09 UTC (rev 407)
+++ mplayerxp/libvo/screenshot.cpp	2012-11-18 15:23:42 UTC (rev 408)
@@ -25,8 +25,7 @@
 
 #include "screenshot.h"
 #include "img_format.h"
-#define UINT64_C __UINT64_C
-#include "postproc/swscale.h"
+#include "mp_conf_lavc.h"
 #include "postproc/vf_scale.h"
 #include "osdep/mplib.h"
 #include "vo_msg.h"

Modified: mplayerxp/libvo/video_out.cpp
===================================================================
--- mplayerxp/libvo/video_out.cpp	2012-11-18 13:04:09 UTC (rev 407)
+++ mplayerxp/libvo/video_out.cpp	2012-11-18 15:23:42 UTC (rev 408)
@@ -32,8 +32,7 @@
 #include "video_out.h"
 
 #include "osdep/shmem.h"
-#define UINT64_C __UINT64_C
-#include "postproc/swscale.h"
+#include "mp_conf_lavc.h"
 #include "postproc/vf.h"
 #include "xmpcore/xmp_core.h"
 #include "osdep/mplib.h"

Modified: mplayerxp/mplayerxp.cpp
===================================================================
--- mplayerxp/mplayerxp.cpp	2012-11-18 13:04:09 UTC (rev 407)
+++ mplayerxp/mplayerxp.cpp	2012-11-18 15:23:42 UTC (rev 408)
@@ -28,7 +28,6 @@
 #include "osdep/mplib.h"
 #include "xmpcore/sig_hand.h"
 
-#define UINT64_C __UINT64_C
 #include "postproc/swscale.h"
 #include "postproc/af.h"
 #include "postproc/vf.h"

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