virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

dshow: rename dshow.h to avoid conflict with system header of equal name

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Kyle 2012-05-24 13:59:33 +02:00 committed by Michael Niedermayer
parent 2f6c5894f4
commit 02cc66dd78
8 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavdevice/Makefile
View File

@ -38,7 +38,7 @@ OBJS-$(CONFIG_X11_GRAB_DEVICE_INDEV) += x11grab.o
OBJS-$(CONFIG_LIBCDIO_INDEV) += libcdio.o OBJS-$(CONFIG_LIBCDIO_INDEV) += libcdio.o
OBJS-$(CONFIG_LIBDC1394_INDEV) += libdc1394.o OBJS-$(CONFIG_LIBDC1394_INDEV) += libdc1394.o
SKIPHEADERS-$(CONFIG_DSHOW_INDEV) += dshow.h SKIPHEADERS-$(CONFIG_DSHOW_INDEV) += dshow_capture.h
SKIPHEADERS-$(HAVE_ALSA_ASOUNDLIB_H) += alsa-audio.h SKIPHEADERS-$(HAVE_ALSA_ASOUNDLIB_H) += alsa-audio.h
SKIPHEADERS-$(HAVE_SNDIO_H) += sndio_common.h SKIPHEADERS-$(HAVE_SNDIO_H) += sndio_common.h

2
libavdevice/dshow.c
View File

@ -23,7 +23,7 @@
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavformat/internal.h" #include "libavformat/internal.h"
#include "avdevice.h" #include "avdevice.h"
#include "dshow.h" #include "dshow_capture.h"
struct dshow_ctx { struct dshow_ctx {
const AVClass *class; const AVClass *class;

0
libavdevice/dshow.h → libavdevice/dshow_capture.h
View File

2
libavdevice/dshow_common.c
View File

@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "dshow.h" #include "dshow_capture.h"
long ff_copy_dshow_media_type(AM_MEDIA_TYPE *dst, const AM_MEDIA_TYPE *src) long ff_copy_dshow_media_type(AM_MEDIA_TYPE *dst, const AM_MEDIA_TYPE *src)
{ {

2
libavdevice/dshow_enummediatypes.c
View File

@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "dshow.h" #include "dshow_capture.h"
DECLARE_QUERYINTERFACE(libAVEnumMediaTypes, DECLARE_QUERYINTERFACE(libAVEnumMediaTypes,
{ {&IID_IUnknown,0}, {&IID_IEnumPins,0} }) { {&IID_IUnknown,0}, {&IID_IEnumPins,0} })

2
libavdevice/dshow_enumpins.c
View File

@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "dshow.h" #include "dshow_capture.h"
DECLARE_QUERYINTERFACE(libAVEnumPins, DECLARE_QUERYINTERFACE(libAVEnumPins,
{ {&IID_IUnknown,0}, {&IID_IEnumPins,0} }) { {&IID_IUnknown,0}, {&IID_IEnumPins,0} })

2
libavdevice/dshow_filter.c
View File

@ -20,7 +20,7 @@
*/ */
#define NO_DSHOW_STRSAFE #define NO_DSHOW_STRSAFE
#include "dshow.h" #include "dshow_capture.h"
DECLARE_QUERYINTERFACE(libAVFilter, DECLARE_QUERYINTERFACE(libAVFilter,
{ {&IID_IUnknown,0}, {&IID_IBaseFilter,0} }) { {&IID_IUnknown,0}, {&IID_IBaseFilter,0} })

2
libavdevice/dshow_pin.c
View File

@ -20,7 +20,7 @@
*/ */
#define NO_DSHOW_STRSAFE #define NO_DSHOW_STRSAFE
#include "dshow.h" #include "dshow_capture.h"
#include <stddef.h> #include <stddef.h>
#define imemoffset offsetof(libAVPin, imemvtbl) #define imemoffset offsetof(libAVPin, imemvtbl)