diff options
author | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-02-05 17:47:54 +0300 |
---|---|---|
committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-02-05 17:47:54 +0300 |
commit | 0acc867ab62d247fd92de0cca343cd2ee73c50cb (patch) | |
tree | f84a874315aa5694c1657b70485d0ee9bbcaf555 | |
parent | 9d1eb34c247fbc3a875afb34b377ed4fd0e22e01 (diff) |
-removed #pragma warning about dxtrans from qedit.h and duplicate defs from libavcodec.def
-installer: workaround for ISPP (when compiling with Inno Setup Compiler, ISPP complained about "File not found")
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1609 10f7b99b-c216-0410-bff0-8a66a9350fd8
-rw-r--r-- | distrib/mpc-hc_setup.iss | 3 | ||||
-rw-r--r-- | include/qedit.h | 9 | ||||
-rw-r--r-- | src/filters/transform/mpcvideodec/ffmpeg/libavcodec.def | 2 |
3 files changed, 2 insertions, 12 deletions
diff --git a/distrib/mpc-hc_setup.iss b/distrib/mpc-hc_setup.iss index 55416ed0c..65e372a0b 100644 --- a/distrib/mpc-hc_setup.iss +++ b/distrib/mpc-hc_setup.iss @@ -9,7 +9,8 @@ #define localize = True
-#include "../include/Version.h"
+;workaround since ISPP doesn't work with relative paths
+#include "Installer/../../include/Version.h"
#define app_name "Media Player Classic - Home Cinema"
#define app_version str(VERSION_MAJOR) + "." + str(VERSION_MINOR) + "." + str(VERSION_REV) + "." + str(VERSION_PATCH)
diff --git a/include/qedit.h b/include/qedit.h index 88d5a6a06..855720a8e 100644 --- a/include/qedit.h +++ b/include/qedit.h @@ -506,15 +506,6 @@ extern "C"{ /* interface __MIDL_itf_qedit_0000_0000 */
/* [local] */
-#pragma message("To compile qedit.h you must install the DirectX 9 SDK, to obtain the dxtrans.h header.")
-
-
-
-
-
-
-
-
typedef /* [public] */
enum __MIDL___MIDL_itf_qedit_0000_0000_0001
diff --git a/src/filters/transform/mpcvideodec/ffmpeg/libavcodec.def b/src/filters/transform/mpcvideodec/ffmpeg/libavcodec.def index 6a334e2ed..8d03a8cf3 100644 --- a/src/filters/transform/mpcvideodec/ffmpeg/libavcodec.def +++ b/src/filters/transform/mpcvideodec/ffmpeg/libavcodec.def @@ -18,9 +18,7 @@ EXPORTS avcodec_thread_free
av_log_set_callback
- av_log_get_callback
av_log_get_level
- av_log_set_level
avcodec_default_get_buffer
avcodec_default_reget_buffer
|