From 02183f6e47ad4ea1057de9950482f291f2ae4290 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 9 Feb 2010 20:12:31 +0000 Subject: Converted #include slashes from \ to / (makes the code more portable) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Patch by Nicolás Alvarez. git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1647 10f7b99b-c216-0410-bff0-8a66a9350fd8 --- src/filters/transform/avi2ac3filter/AVI2AC3Filter.cpp | 4 ++-- src/filters/transform/avi2ac3filter/stdafx.h | 2 +- src/filters/transform/basevideofilter/BaseVideoFilter.cpp | 4 ++-- src/filters/transform/basevideofilter/stdafx.h | 2 +- src/filters/transform/bufferfilter/BufferFilter.cpp | 4 ++-- src/filters/transform/bufferfilter/stdafx.h | 2 +- src/filters/transform/decssfilter/DeCSSFilter.cpp | 6 +++--- src/filters/transform/decssfilter/stdafx.h | 2 +- src/filters/transform/mpadecfilter/MpaDecFilter.cpp | 8 ++++---- src/filters/transform/mpadecfilter/MpaDecFilter.h | 14 +++++++------- src/filters/transform/mpadecfilter/MpaDecSettingsWnd.cpp | 2 +- src/filters/transform/mpadecfilter/MpaDecSettingsWnd.h | 2 +- src/filters/transform/mpadecfilter/stdafx.h | 2 +- src/filters/transform/mpcvideodec/DXVADecoder.cpp | 2 +- src/filters/transform/mpcvideodec/DXVADecoderH264.cpp | 2 +- src/filters/transform/mpcvideodec/MPCAudioDecFilter.cpp | 2 +- src/filters/transform/mpcvideodec/MPCFfmpegDec.cpp | 4 ++-- src/filters/transform/mpcvideodec/MPCVideoDecFilter.cpp | 8 ++++---- src/filters/transform/mpcvideodec/MPCVideoDecFilter.h | 4 ++-- .../transform/mpcvideodec/MPCVideoDecSettingsWnd.cpp | 2 +- src/filters/transform/mpcvideodec/MPCVideoDecSettingsWnd.h | 2 +- src/filters/transform/mpcvideodec/VideoDecOutputPin.cpp | 2 +- src/filters/transform/mpcvideodec/VideoDecOutputPin.h | 2 +- .../transform/mpcvideodec/ffmpeg/libavcodec/tableprint.c | 2 +- src/filters/transform/mpcvideodec/stdafx.h | 2 +- src/filters/transform/mpeg2decfilter/Mpeg2DecFilter.cpp | 8 ++++---- src/filters/transform/mpeg2decfilter/Mpeg2DecFilter.h | 4 ++-- .../transform/mpeg2decfilter/Mpeg2DecSettingsWnd.cpp | 2 +- src/filters/transform/mpeg2decfilter/Mpeg2DecSettingsWnd.h | 2 +- src/filters/transform/mpeg2decfilter/idct_sse2.cpp | 2 +- src/filters/transform/mpeg2decfilter/libmpeg2.cpp | 2 +- src/filters/transform/mpeg2decfilter/mc_sse2.cpp | 2 +- src/filters/transform/vsfilter/Copy.cpp | 4 ++-- src/filters/transform/vsfilter/DirectVobSubFilter.cpp | 4 ++-- src/filters/transform/vsfilter/DirectVobSubFilter.h | 8 ++++---- src/filters/transform/vsfilter/DirectVobSubPropPage.cpp | 4 ++-- src/filters/transform/vsfilter/IDirectVobSub.h | 2 +- src/filters/transform/vsfilter/StdAfx.h | 4 ++-- src/filters/transform/vsfilter/StyleEditorDialog.h | 2 +- src/filters/transform/vsfilter/Systray.cpp | 2 +- src/filters/transform/vsfilter/TextInputPin.cpp | 2 +- src/filters/transform/vsfilter/TextInputPin.h | 2 +- src/filters/transform/vsfilter/VSFilter.cpp | 2 +- src/filters/transform/vsfilter/csriapi.cpp | 8 ++++---- src/filters/transform/vsfilter/plugins.cpp | 14 +++++++------- src/filters/transform/vsfilter/valami.cpp | 2 +- 46 files changed, 85 insertions(+), 85 deletions(-) (limited to 'src/filters/transform') diff --git a/src/filters/transform/avi2ac3filter/AVI2AC3Filter.cpp b/src/filters/transform/avi2ac3filter/AVI2AC3Filter.cpp index 2167a6502..13a5d4619 100644 --- a/src/filters/transform/avi2ac3filter/AVI2AC3Filter.cpp +++ b/src/filters/transform/avi2ac3filter/AVI2AC3Filter.cpp @@ -22,7 +22,7 @@ #include "stdafx.h" #include #include "avi2ac3filter.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" #include #include @@ -68,7 +68,7 @@ STDAPI DllUnregisterServer() return AMovieDllRegisterServer2(FALSE); } -#include "..\..\FilterApp.h" +#include "../../FilterApp.h" CFilterApp theApp; diff --git a/src/filters/transform/avi2ac3filter/stdafx.h b/src/filters/transform/avi2ac3filter/stdafx.h index 31d136cf9..c35359c38 100644 --- a/src/filters/transform/avi2ac3filter/stdafx.h +++ b/src/filters/transform/avi2ac3filter/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit diff --git a/src/filters/transform/basevideofilter/BaseVideoFilter.cpp b/src/filters/transform/basevideofilter/BaseVideoFilter.cpp index 7edce914b..f7e7f6f30 100644 --- a/src/filters/transform/basevideofilter/BaseVideoFilter.cpp +++ b/src/filters/transform/basevideofilter/BaseVideoFilter.cpp @@ -22,8 +22,8 @@ #include "StdAfx.h" #include #include "BaseVideoFilter.h" -#include "..\..\..\DSUtil\DSUtil.h" -#include "..\..\..\DSUtil\MediaTypes.h" +#include "../../../DSUtil/DSUtil.h" +#include "../../../DSUtil/MediaTypes.h" #include #include diff --git a/src/filters/transform/basevideofilter/stdafx.h b/src/filters/transform/basevideofilter/stdafx.h index fd4805916..8068e9c6e 100644 --- a/src/filters/transform/basevideofilter/stdafx.h +++ b/src/filters/transform/basevideofilter/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit diff --git a/src/filters/transform/bufferfilter/BufferFilter.cpp b/src/filters/transform/bufferfilter/BufferFilter.cpp index a8d862cfe..0e8ba715f 100644 --- a/src/filters/transform/bufferfilter/BufferFilter.cpp +++ b/src/filters/transform/bufferfilter/BufferFilter.cpp @@ -21,7 +21,7 @@ #include "stdafx.h" #include "bufferfilter.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" #ifdef REGISTER_FILTER @@ -63,7 +63,7 @@ STDAPI DllUnregisterServer() return AMovieDllRegisterServer2(FALSE); } -#include "..\..\FilterApp.h" +#include "../../FilterApp.h" CFilterApp theApp; diff --git a/src/filters/transform/bufferfilter/stdafx.h b/src/filters/transform/bufferfilter/stdafx.h index 31d136cf9..c35359c38 100644 --- a/src/filters/transform/bufferfilter/stdafx.h +++ b/src/filters/transform/bufferfilter/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit diff --git a/src/filters/transform/decssfilter/DeCSSFilter.cpp b/src/filters/transform/decssfilter/DeCSSFilter.cpp index 97c99b3df..5159cb776 100644 --- a/src/filters/transform/decssfilter/DeCSSFilter.cpp +++ b/src/filters/transform/decssfilter/DeCSSFilter.cpp @@ -22,8 +22,8 @@ #include "stdafx.h" #include #include "DeCSSFilter.h" -#include "..\..\..\decss\DeCSSInputPin.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../decss/DeCSSInputPin.h" +#include "../../../DSUtil/DSUtil.h" #ifdef REGISTER_FILTER @@ -66,7 +66,7 @@ STDAPI DllUnregisterServer() return AMovieDllRegisterServer2(FALSE); } -#include "..\..\FilterApp.h" +#include "../../FilterApp.h" CFilterApp theApp; diff --git a/src/filters/transform/decssfilter/stdafx.h b/src/filters/transform/decssfilter/stdafx.h index 31d136cf9..c35359c38 100644 --- a/src/filters/transform/decssfilter/stdafx.h +++ b/src/filters/transform/decssfilter/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit diff --git a/src/filters/transform/mpadecfilter/MpaDecFilter.cpp b/src/filters/transform/mpadecfilter/MpaDecFilter.cpp index b13a24d99..7cb691923 100644 --- a/src/filters/transform/mpadecfilter/MpaDecFilter.cpp +++ b/src/filters/transform/mpadecfilter/MpaDecFilter.cpp @@ -25,7 +25,7 @@ #include #include "MpaDecFilter.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" #include #include @@ -34,8 +34,8 @@ #include "PODtypes.h" #include "avcodec.h" -#include "faad2\include\neaacdec.h" -#include "FLAC\stream_decoder.h" +#include "faad2/include/neaacdec.h" +#include "FLAC/stream_decoder.h" #define INT24_MAX 0x7FFFFF #define EAC3_FRAME_TYPE_RESERVED 3 @@ -151,7 +151,7 @@ STDAPI DllUnregisterServer() // -#include "..\..\FilterApp.h" +#include "../../FilterApp.h" CFilterApp theApp; diff --git a/src/filters/transform/mpadecfilter/MpaDecFilter.h b/src/filters/transform/mpadecfilter/MpaDecFilter.h index 0acd9da20..6c1711fae 100644 --- a/src/filters/transform/mpadecfilter/MpaDecFilter.h +++ b/src/filters/transform/mpadecfilter/MpaDecFilter.h @@ -23,13 +23,13 @@ #include #include -#include "libmad\msvc++\mad.h" -#include "a52dec\include\a52.h" -#include "libdca\include\dts.h" -//#include "faad2\include\neaacdec.h" // conflicts with dxtrans.h -//#include "libvorbisidec\ivorbiscodec.h" -#include "libvorbisidec\vorbis/codec.h" -#include "..\..\..\decss\DeCSSInputPin.h" +#include "libmad/msvc++/mad.h" +#include "a52dec/include/a52.h" +#include "libdca/include/dts.h" +//#include "faad2/include/neaacdec.h" // conflicts with dxtrans.h +//#include "libvorbisidec/ivorbiscodec.h" +#include "libvorbisidec/vorbis/codec.h" +#include "../../../decss/DeCSSInputPin.h" #include "IMpaDecFilter.h" #include "MpaDecSettingsWnd.h" diff --git a/src/filters/transform/mpadecfilter/MpaDecSettingsWnd.cpp b/src/filters/transform/mpadecfilter/MpaDecSettingsWnd.cpp index 002730428..e0509bc7c 100644 --- a/src/filters/transform/mpadecfilter/MpaDecSettingsWnd.cpp +++ b/src/filters/transform/mpadecfilter/MpaDecSettingsWnd.cpp @@ -22,7 +22,7 @@ #include "stdafx.h" #include "resource.h" #include "MpaDecSettingsWnd.h" -#include "..\..\..\dsutil\dsutil.h" +#include "../../../dsutil/dsutil.h" // ==>>> Resource identifier from "resource.h" present in mplayerc project! diff --git a/src/filters/transform/mpadecfilter/MpaDecSettingsWnd.h b/src/filters/transform/mpadecfilter/MpaDecSettingsWnd.h index 59c12aeae..cf459b705 100644 --- a/src/filters/transform/mpadecfilter/MpaDecSettingsWnd.h +++ b/src/filters/transform/mpadecfilter/MpaDecSettingsWnd.h @@ -21,7 +21,7 @@ #pragma once -#include "..\..\InternalPropertyPage.h" +#include "../../InternalPropertyPage.h" #include "MpaDecFilter.h" #include diff --git a/src/filters/transform/mpadecfilter/stdafx.h b/src/filters/transform/mpadecfilter/stdafx.h index 31d136cf9..c35359c38 100644 --- a/src/filters/transform/mpadecfilter/stdafx.h +++ b/src/filters/transform/mpadecfilter/stdafx.h @@ -25,7 +25,7 @@ // #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit diff --git a/src/filters/transform/mpcvideodec/DXVADecoder.cpp b/src/filters/transform/mpcvideodec/DXVADecoder.cpp index c407d4dd9..8c28598ac 100644 --- a/src/filters/transform/mpcvideodec/DXVADecoder.cpp +++ b/src/filters/transform/mpcvideodec/DXVADecoder.cpp @@ -21,7 +21,7 @@ */ #include "stdafx.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" #include #include #include "DXVADecoderH264.h" diff --git a/src/filters/transform/mpcvideodec/DXVADecoderH264.cpp b/src/filters/transform/mpcvideodec/DXVADecoderH264.cpp index e21a1fade..de1aecbd7 100644 --- a/src/filters/transform/mpcvideodec/DXVADecoderH264.cpp +++ b/src/filters/transform/mpcvideodec/DXVADecoderH264.cpp @@ -21,7 +21,7 @@ */ #include "stdafx.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" #include "DXVADecoderH264.h" #include "MPCVideoDecFilter.h" #include "VideoDecDXVAAllocator.h" diff --git a/src/filters/transform/mpcvideodec/MPCAudioDecFilter.cpp b/src/filters/transform/mpcvideodec/MPCAudioDecFilter.cpp index a9403432b..fb69949dc 100644 --- a/src/filters/transform/mpcvideodec/MPCAudioDecFilter.cpp +++ b/src/filters/transform/mpcvideodec/MPCAudioDecFilter.cpp @@ -31,7 +31,7 @@ #include "MPCAudioDecFilter.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" #include #include diff --git a/src/filters/transform/mpcvideodec/MPCFfmpegDec.cpp b/src/filters/transform/mpcvideodec/MPCFfmpegDec.cpp index 626a2b6d2..838ab5b0e 100644 --- a/src/filters/transform/mpcvideodec/MPCFfmpegDec.cpp +++ b/src/filters/transform/mpcvideodec/MPCFfmpegDec.cpp @@ -23,7 +23,7 @@ #include "stdafx.h" #include "MPCVideoDecFilter.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" @@ -66,7 +66,7 @@ STDAPI DllUnregisterServer() // -#include "..\..\FilterApp.h" +#include "../../FilterApp.h" CFilterApp theApp; diff --git a/src/filters/transform/mpcvideodec/MPCVideoDecFilter.cpp b/src/filters/transform/mpcvideodec/MPCVideoDecFilter.cpp index a875c138e..c0df4e01c 100644 --- a/src/filters/transform/mpcvideodec/MPCVideoDecFilter.cpp +++ b/src/filters/transform/mpcvideodec/MPCVideoDecFilter.cpp @@ -36,14 +36,14 @@ extern "C" { #include "FfmpegContext.h" - #include "libswscale\swscale.h" + #include "libswscale/swscale.h" extern void init_libvo(); } -#include "..\..\..\DSUtil\DSUtil.h" -#include "..\..\..\DSUtil\MediaTypes.h" -#include "..\..\parser\mpegsplitter\MpegSplitter.h" +#include "../../../DSUtil/DSUtil.h" +#include "../../../DSUtil/MediaTypes.h" +#include "../../parser/mpegsplitter/MpegSplitter.h" #include diff --git a/src/filters/transform/mpcvideodec/MPCVideoDecFilter.h b/src/filters/transform/mpcvideodec/MPCVideoDecFilter.h index 6e5ad6362..7e8febb37 100644 --- a/src/filters/transform/mpcvideodec/MPCVideoDecFilter.h +++ b/src/filters/transform/mpcvideodec/MPCVideoDecFilter.h @@ -26,11 +26,11 @@ #include // DXVA1 #include #include // DXVA2 -#include "..\BaseVideoFilter\BaseVideoFilter.h" +#include "../BaseVideoFilter/BaseVideoFilter.h" #include "IMPCVideoDecFilter.h" #include "MPCVideoDecSettingsWnd.h" -#include "..\..\..\decss\DeCSSInputPin.h" +#include "../../../decss/DeCSSInputPin.h" #include "DXVADecoder.h" #include "TlibavcodecExt.h" diff --git a/src/filters/transform/mpcvideodec/MPCVideoDecSettingsWnd.cpp b/src/filters/transform/mpcvideodec/MPCVideoDecSettingsWnd.cpp index bc33092a8..cfc88e0e8 100644 --- a/src/filters/transform/mpcvideodec/MPCVideoDecSettingsWnd.cpp +++ b/src/filters/transform/mpcvideodec/MPCVideoDecSettingsWnd.cpp @@ -23,7 +23,7 @@ #include "stdafx.h" #include "resource.h" #include "MPCVideoDecSettingsWnd.h" -#include "..\..\..\dsutil\dsutil.h" +#include "../../../dsutil/dsutil.h" #include "../../../apps/mplayerc/internal_filter_config.h" diff --git a/src/filters/transform/mpcvideodec/MPCVideoDecSettingsWnd.h b/src/filters/transform/mpcvideodec/MPCVideoDecSettingsWnd.h index 9d3cfec60..01979df3f 100644 --- a/src/filters/transform/mpcvideodec/MPCVideoDecSettingsWnd.h +++ b/src/filters/transform/mpcvideodec/MPCVideoDecSettingsWnd.h @@ -22,7 +22,7 @@ #pragma once -#include "..\..\InternalPropertyPage.h" +#include "../../InternalPropertyPage.h" #include "IMPCVideoDecFilter.h" #include diff --git a/src/filters/transform/mpcvideodec/VideoDecOutputPin.cpp b/src/filters/transform/mpcvideodec/VideoDecOutputPin.cpp index 677a6f752..377a0a652 100644 --- a/src/filters/transform/mpcvideodec/VideoDecOutputPin.cpp +++ b/src/filters/transform/mpcvideodec/VideoDecOutputPin.cpp @@ -24,7 +24,7 @@ #include "VideoDecOutputPin.h" #include "VideoDecDXVAAllocator.h" #include "MPCVideoDecFilter.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" CVideoDecOutputPin::CVideoDecOutputPin(TCHAR* pObjectName, CBaseVideoFilter* pFilter, HRESULT* phr, LPCWSTR pName) : CBaseVideoOutputPin(pObjectName, pFilter, phr, pName) diff --git a/src/filters/transform/mpcvideodec/VideoDecOutputPin.h b/src/filters/transform/mpcvideodec/VideoDecOutputPin.h index cbb898294..d6de33575 100644 --- a/src/filters/transform/mpcvideodec/VideoDecOutputPin.h +++ b/src/filters/transform/mpcvideodec/VideoDecOutputPin.h @@ -24,7 +24,7 @@ #pragma once #include -#include "..\BaseVideoFilter\BaseVideoFilter.h" +#include "../BaseVideoFilter/BaseVideoFilter.h" class CMPCVideoDecFilter; diff --git a/src/filters/transform/mpcvideodec/ffmpeg/libavcodec/tableprint.c b/src/filters/transform/mpcvideodec/ffmpeg/libavcodec/tableprint.c index 8bffc2c0e..bca94e8d4 100644 --- a/src/filters/transform/mpcvideodec/ffmpeg/libavcodec/tableprint.c +++ b/src/filters/transform/mpcvideodec/ffmpeg/libavcodec/tableprint.c @@ -62,7 +62,7 @@ WRITE_2D_FUNC(uint32, uint32_t) // int i; // // printf("/* This file was generated by libavcodec/tableprint */\n"); -// printf("#include \n"); +// printf("#include /n"); // tableinit(); // // for (i = 0; tables[i].declaration; i++) { diff --git a/src/filters/transform/mpcvideodec/stdafx.h b/src/filters/transform/mpcvideodec/stdafx.h index 0ba3a2a4d..41d2d3d49 100644 --- a/src/filters/transform/mpcvideodec/stdafx.h +++ b/src/filters/transform/mpcvideodec/stdafx.h @@ -22,7 +22,7 @@ #pragma once -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit diff --git a/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter.cpp b/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter.cpp index 3dbe069f0..81c31982b 100644 --- a/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter.cpp +++ b/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter.cpp @@ -30,8 +30,8 @@ #include #include -#include "..\..\..\DSUtil\DSUtil.h" -#include "..\..\..\DSUtil\MediaTypes.h" +#include "../../../DSUtil/DSUtil.h" +#include "../../../DSUtil/MediaTypes.h" #include #include @@ -92,7 +92,7 @@ STDAPI DllUnregisterServer() // -#include +#include BOOL (__stdcall * Real_IsDebuggerPresent)(void) = IsDebuggerPresent; @@ -156,7 +156,7 @@ LONG WINAPI Mine_ChangeDisplaySettingsExW(LPCWSTR lpszDeviceName, LPDEVMODEW lpD // -#include "..\..\FilterApp.h" +#include "../../FilterApp.h" class CMpeg2DecFilterApp : public CFilterApp { diff --git a/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter.h b/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter.h index ceb9cdd82..66a0acdd6 100644 --- a/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter.h +++ b/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter.h @@ -23,8 +23,8 @@ #include #include -#include "..\..\..\decss\DeCSSInputPin.h" -#include "..\BaseVideoFilter\BaseVideoFilter.h" +#include "../../../decss/DeCSSInputPin.h" +#include "../BaseVideoFilter/BaseVideoFilter.h" #include "IMpeg2DecFilter.h" #include "Mpeg2DecSettingsWnd.h" diff --git a/src/filters/transform/mpeg2decfilter/Mpeg2DecSettingsWnd.cpp b/src/filters/transform/mpeg2decfilter/Mpeg2DecSettingsWnd.cpp index 08314c0cd..cfd2ddee1 100644 --- a/src/filters/transform/mpeg2decfilter/Mpeg2DecSettingsWnd.cpp +++ b/src/filters/transform/mpeg2decfilter/Mpeg2DecSettingsWnd.cpp @@ -22,7 +22,7 @@ #include "stdafx.h" #include "resource.h" #include "Mpeg2DecSettingsWnd.h" -#include "..\..\..\dsutil\dsutil.h" +#include "../../../dsutil/dsutil.h" // ==>>> Resource identifier from "resource.h" present in mplayerc project! #define ResStr(id) CString(MAKEINTRESOURCE(id)) diff --git a/src/filters/transform/mpeg2decfilter/Mpeg2DecSettingsWnd.h b/src/filters/transform/mpeg2decfilter/Mpeg2DecSettingsWnd.h index 35329f48c..4f694d8cb 100644 --- a/src/filters/transform/mpeg2decfilter/Mpeg2DecSettingsWnd.h +++ b/src/filters/transform/mpeg2decfilter/Mpeg2DecSettingsWnd.h @@ -21,7 +21,7 @@ #pragma once -#include "..\..\InternalPropertyPage.h" +#include "../../InternalPropertyPage.h" #include "IMpeg2DecFilter.h" #include diff --git a/src/filters/transform/mpeg2decfilter/idct_sse2.cpp b/src/filters/transform/mpeg2decfilter/idct_sse2.cpp index e1132722c..134707c76 100644 --- a/src/filters/transform/mpeg2decfilter/idct_sse2.cpp +++ b/src/filters/transform/mpeg2decfilter/idct_sse2.cpp @@ -25,7 +25,7 @@ #include #include "libmpeg2.h" #include "attributes.h" -#include "..\..\..\DSUtil\simd.h" +#include "../../../DSUtil/simd.h" // Intel's SSE2 implementation of iDCT // AP-945 diff --git a/src/filters/transform/mpeg2decfilter/libmpeg2.cpp b/src/filters/transform/mpeg2decfilter/libmpeg2.cpp index 9f5767708..bb3aceb00 100644 --- a/src/filters/transform/mpeg2decfilter/libmpeg2.cpp +++ b/src/filters/transform/mpeg2decfilter/libmpeg2.cpp @@ -25,7 +25,7 @@ #include #include #include "libmpeg2.h" -#include "..\..\..\DSUtil\vd.h" +#include "../../../DSUtil/vd.h" // decode diff --git a/src/filters/transform/mpeg2decfilter/mc_sse2.cpp b/src/filters/transform/mpeg2decfilter/mc_sse2.cpp index 9c9cfa0e3..3d5061bd0 100644 --- a/src/filters/transform/mpeg2decfilter/mc_sse2.cpp +++ b/src/filters/transform/mpeg2decfilter/mc_sse2.cpp @@ -25,7 +25,7 @@ #include #include "libmpeg2.h" #include "attributes.h" -#include "..\..\..\DSUtil\simd.h" +#include "../../../DSUtil/simd.h" static const __m128i const_1_16_bytes=_mm_set1_epi16(1); diff --git a/src/filters/transform/vsfilter/Copy.cpp b/src/filters/transform/vsfilter/Copy.cpp index ea8cffcd3..25038f83c 100644 --- a/src/filters/transform/vsfilter/Copy.cpp +++ b/src/filters/transform/vsfilter/Copy.cpp @@ -19,8 +19,8 @@ #include "stdafx.h" #include #include "DirectVobSubFilter.h" -#include "..\..\..\DSUtil\DSUtil.h" -#include "..\..\..\DSUtil\MediaTypes.h" +#include "../../../DSUtil/DSUtil.h" +#include "../../../DSUtil/MediaTypes.h" #include #include diff --git a/src/filters/transform/vsfilter/DirectVobSubFilter.cpp b/src/filters/transform/vsfilter/DirectVobSubFilter.cpp index 3cdc03ae9..8a7a13c1c 100644 --- a/src/filters/transform/vsfilter/DirectVobSubFilter.cpp +++ b/src/filters/transform/vsfilter/DirectVobSubFilter.cpp @@ -27,8 +27,8 @@ #include "DirectVobSubPropPage.h" #include "VSFilter.h" #include "systray.h" -#include "..\..\..\DSUtil\MediaTypes.h" -#include "..\..\..\SubPic\MemSubPic.h" +#include "../../../DSUtil/MediaTypes.h" +#include "../../../SubPic/MemSubPic.h" #include #include diff --git a/src/filters/transform/vsfilter/DirectVobSubFilter.h b/src/filters/transform/vsfilter/DirectVobSubFilter.h index 39272ce99..56f1cb8de 100644 --- a/src/filters/transform/vsfilter/DirectVobSubFilter.h +++ b/src/filters/transform/vsfilter/DirectVobSubFilter.h @@ -23,10 +23,10 @@ #include #include "DirectVobSub.h" -#include "..\BaseVideoFilter\BaseVideoFilter.h" -#include "..\..\..\subtitles\VobSubFile.h" -#include "..\..\..\subtitles\RTS.h" -#include "..\..\..\subtitles\SSF.h" +#include "../BaseVideoFilter/BaseVideoFilter.h" +#include "../../../subtitles/VobSubFile.h" +#include "../../../subtitles/RTS.h" +#include "../../../subtitles/SSF.h" typedef struct { diff --git a/src/filters/transform/vsfilter/DirectVobSubPropPage.cpp b/src/filters/transform/vsfilter/DirectVobSubPropPage.cpp index 52b45c84b..675848a1a 100644 --- a/src/filters/transform/vsfilter/DirectVobSubPropPage.cpp +++ b/src/filters/transform/vsfilter/DirectVobSubPropPage.cpp @@ -27,8 +27,8 @@ #include "VSFilter.h" #include "StyleEditorDialog.h" -#include "..\..\..\DSUtil\DSUtil.h" -#include "..\..\..\DSUtil\MediaTypes.h" +#include "../../../DSUtil/DSUtil.h" +#include "../../../DSUtil/MediaTypes.h" BOOL WINAPI MyGetDialogSize(int iResourceID, DLGPROC pDlgProc, LPARAM lParam, SIZE* pResult) { diff --git a/src/filters/transform/vsfilter/IDirectVobSub.h b/src/filters/transform/vsfilter/IDirectVobSub.h index 4d22120e3..a789c5a66 100644 --- a/src/filters/transform/vsfilter/IDirectVobSub.h +++ b/src/filters/transform/vsfilter/IDirectVobSub.h @@ -21,7 +21,7 @@ #pragma once -#include "..\..\..\subtitles\STS.h" +#include "../../../subtitles/STS.h" #ifdef __cplusplus extern "C" { diff --git a/src/filters/transform/vsfilter/StdAfx.h b/src/filters/transform/vsfilter/StdAfx.h index 2830e436b..3c6c2a063 100644 --- a/src/filters/transform/vsfilter/StdAfx.h +++ b/src/filters/transform/vsfilter/StdAfx.h @@ -39,7 +39,7 @@ #undef WINVER #define WINVER 0x0501 // <= Force WINVER 0x0501 with Visual Studio 2008 (fix compilation error) -#include "..\..\..\DSUtil\SharedInclude.h" +#include "../../../DSUtil/SharedInclude.h" #include #include @@ -54,7 +54,7 @@ extern CComModule _Module; #include #include -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. diff --git a/src/filters/transform/vsfilter/StyleEditorDialog.h b/src/filters/transform/vsfilter/StyleEditorDialog.h index 0c5c2054d..1d74eb757 100644 --- a/src/filters/transform/vsfilter/StyleEditorDialog.h +++ b/src/filters/transform/vsfilter/StyleEditorDialog.h @@ -23,7 +23,7 @@ #include "resource.h" #include "afxwin.h" #include "afxcmn.h" -#include "..\..\..\subtitles\STS.h" +#include "../../../subtitles/STS.h" // CColorStatic dialog diff --git a/src/filters/transform/vsfilter/Systray.cpp b/src/filters/transform/vsfilter/Systray.cpp index 9a4655316..3df0bafb4 100644 --- a/src/filters/transform/vsfilter/Systray.cpp +++ b/src/filters/transform/vsfilter/Systray.cpp @@ -22,7 +22,7 @@ #include "stdafx.h" #include "resource.h" #include "DirectVobSubFilter.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" // hWnd == INVALID_HANDLE_VALUE - get name, hWnd != INVALID_HANDLE_VALUE - show ppage static TCHAR* CallPPage(IFilterGraph* pGraph, int idx, HWND hWnd); diff --git a/src/filters/transform/vsfilter/TextInputPin.cpp b/src/filters/transform/vsfilter/TextInputPin.cpp index 2abd2b431..9935f6a13 100644 --- a/src/filters/transform/vsfilter/TextInputPin.cpp +++ b/src/filters/transform/vsfilter/TextInputPin.cpp @@ -22,7 +22,7 @@ #include "stdafx.h" #include "DirectVobSubFilter.h" #include "TextInputPin.h" -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" CTextInputPin::CTextInputPin(CDirectVobSubFilter* pFilter, CCritSec* pLock, CCritSec* pSubLock, HRESULT* phr) : CSubtitleInputPin(pFilter, pLock, pSubLock, phr) diff --git a/src/filters/transform/vsfilter/TextInputPin.h b/src/filters/transform/vsfilter/TextInputPin.h index 4a3d1debf..b28f71890 100644 --- a/src/filters/transform/vsfilter/TextInputPin.h +++ b/src/filters/transform/vsfilter/TextInputPin.h @@ -21,7 +21,7 @@ #pragma once -#include "..\..\..\subtitles\SubtitleInputPin.h" +#include "../../../subtitles/SubtitleInputPin.h" class CDirectVobSubFilter; diff --git a/src/filters/transform/vsfilter/VSFilter.cpp b/src/filters/transform/vsfilter/VSFilter.cpp index 32a769114..f772cc5cf 100644 --- a/src/filters/transform/vsfilter/VSFilter.cpp +++ b/src/filters/transform/vsfilter/VSFilter.cpp @@ -23,7 +23,7 @@ #include "DirectVobSubFilter.h" #include "DirectVobSubPropPage.h" #include "VSFilter.h" -#include "..\..\..\DSUtil\MediaTypes.h" +#include "../../../DSUtil/MediaTypes.h" #include #include diff --git a/src/filters/transform/vsfilter/csriapi.cpp b/src/filters/transform/vsfilter/csriapi.cpp index eed931f5b..17dec964e 100644 --- a/src/filters/transform/vsfilter/csriapi.cpp +++ b/src/filters/transform/vsfilter/csriapi.cpp @@ -23,10 +23,10 @@ #include #include #include "resource.h" -#include "..\..\..\subtitles\VobSubFile.h" -#include "..\..\..\subtitles\RTS.h" -#include "..\..\..\subtitles\SSF.h" -#include "..\..\..\SubPic\MemSubPic.h" +#include "../../../subtitles/VobSubFile.h" +#include "../../../subtitles/RTS.h" +#include "../../../subtitles/SSF.h" +#include "../../../SubPic/MemSubPic.h" #define CSRIAPI extern "C" __declspec(dllexport) #define CSRI_OWN_HANDLES diff --git a/src/filters/transform/vsfilter/plugins.cpp b/src/filters/transform/vsfilter/plugins.cpp index 158cf4b17..2ff493991 100644 --- a/src/filters/transform/vsfilter/plugins.cpp +++ b/src/filters/transform/vsfilter/plugins.cpp @@ -23,10 +23,10 @@ #include #include #include "resource.h" -#include "..\..\..\subtitles\VobSubFile.h" -#include "..\..\..\subtitles\RTS.h" -#include "..\..\..\subtitles\SSF.h" -#include "..\..\..\SubPic\MemSubPic.h" +#include "../../../subtitles/VobSubFile.h" +#include "../../../subtitles/RTS.h" +#include "../../../subtitles/SSF.h" +#include "../../../SubPic/MemSubPic.h" // // Generic interface @@ -240,7 +240,7 @@ public: namespace VirtualDub { - #include + #include class CVirtualDubFilter : virtual public CFilter { @@ -500,7 +500,7 @@ namespace VirtualDub namespace AviSynth1 { - #include + #include class CAvisynthFilter : public GenericVideoFilter, virtual public CFilter { @@ -614,7 +614,7 @@ namespace AviSynth1 namespace AviSynth25 { - #include + #include static bool s_fSwapUV = false; diff --git a/src/filters/transform/vsfilter/valami.cpp b/src/filters/transform/vsfilter/valami.cpp index b2115e6f7..4ebc21c84 100644 --- a/src/filters/transform/vsfilter/valami.cpp +++ b/src/filters/transform/vsfilter/valami.cpp @@ -19,7 +19,7 @@ * */ -#include "..\..\..\DSUtil\DSUtil.h" +#include "../../../DSUtil/DSUtil.h" static TCHAR str1[][256] = /* -- cgit v1.2.3