diff options
author | Kyle <kshawkeye@gmail.com> | 2012-05-24 13:59:33 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-24 14:15:10 +0200 |
commit | 02cc66dd78d929690df9f5db5ba6c0c825bdc267 (patch) | |
tree | 943ced9edc890ea3cde765dc9aa60bd069c3e634 /libavdevice/dshow_enummediatypes.c | |
parent | 2f6c5894f476c74551071259e79a11ec88513cf9 (diff) | |
download | ffmpeg-02cc66dd78d929690df9f5db5ba6c0c825bdc267.tar.gz |
dshow: rename dshow.h to avoid conflict with system header of equal name
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/dshow_enummediatypes.c')
-rw-r--r-- | libavdevice/dshow_enummediatypes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavdevice/dshow_enummediatypes.c b/libavdevice/dshow_enummediatypes.c index a700133ba6..aaed58b449 100644 --- a/libavdevice/dshow_enummediatypes.c +++ b/libavdevice/dshow_enummediatypes.c @@ -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} }) |