Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
02cc66dd
Commit
02cc66dd
authored
May 24, 2012
by
Kyle
Committed by
Michael Niedermayer
May 24, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dshow: rename dshow.h to avoid conflict with system header of equal name
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
2f6c5894
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
7 additions
and
7 deletions
+7
-7
Makefile
libavdevice/Makefile
+1
-1
dshow.c
libavdevice/dshow.c
+1
-1
dshow_capture.h
libavdevice/dshow_capture.h
+0
-0
dshow_common.c
libavdevice/dshow_common.c
+1
-1
dshow_enummediatypes.c
libavdevice/dshow_enummediatypes.c
+1
-1
dshow_enumpins.c
libavdevice/dshow_enumpins.c
+1
-1
dshow_filter.c
libavdevice/dshow_filter.c
+1
-1
dshow_pin.c
libavdevice/dshow_pin.c
+1
-1
No files found.
libavdevice/Makefile
View file @
02cc66dd
...
...
@@ -38,7 +38,7 @@ OBJS-$(CONFIG_X11_GRAB_DEVICE_INDEV) += x11grab.o
OBJS-$(CONFIG_LIBCDIO_INDEV)
+=
libcdio.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_SNDIO_H)
+=
sndio_common.h
...
...
libavdevice/dshow.c
View file @
02cc66dd
...
...
@@ -23,7 +23,7 @@
#include "libavutil/opt.h"
#include "libavformat/internal.h"
#include "avdevice.h"
#include "dshow.h"
#include "dshow
_capture
.h"
struct
dshow_ctx
{
const
AVClass
*
class
;
...
...
libavdevice/dshow.h
→
libavdevice/dshow
_capture
.h
View file @
02cc66dd
File moved
libavdevice/dshow_common.c
View file @
02cc66dd
...
...
@@ -19,7 +19,7 @@
* 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
)
{
...
...
libavdevice/dshow_enummediatypes.c
View file @
02cc66dd
...
...
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "dshow.h"
#include "dshow
_capture
.h"
DECLARE_QUERYINTERFACE
(
libAVEnumMediaTypes
,
{
{
&
IID_IUnknown
,
0
},
{
&
IID_IEnumPins
,
0
}
})
...
...
libavdevice/dshow_enumpins.c
View file @
02cc66dd
...
...
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "dshow.h"
#include "dshow
_capture
.h"
DECLARE_QUERYINTERFACE
(
libAVEnumPins
,
{
{
&
IID_IUnknown
,
0
},
{
&
IID_IEnumPins
,
0
}
})
...
...
libavdevice/dshow_filter.c
View file @
02cc66dd
...
...
@@ -20,7 +20,7 @@
*/
#define NO_DSHOW_STRSAFE
#include "dshow.h"
#include "dshow
_capture
.h"
DECLARE_QUERYINTERFACE
(
libAVFilter
,
{
{
&
IID_IUnknown
,
0
},
{
&
IID_IBaseFilter
,
0
}
})
...
...
libavdevice/dshow_pin.c
View file @
02cc66dd
...
...
@@ -20,7 +20,7 @@
*/
#define NO_DSHOW_STRSAFE
#include "dshow.h"
#include "dshow
_capture
.h"
#include <stddef.h>
#define imemoffset offsetof(libAVPin, imemvtbl)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment