diff options
| -rw-r--r-- | dom/media/moz.build | 8 | ||||
| -rw-r--r-- | old-configure.in | 19 | ||||
| -rw-r--r-- | toolkit/library/moz.build | 8 |
3 files changed, 0 insertions, 35 deletions
diff --git a/dom/media/moz.build b/dom/media/moz.build index 4d036a5f6..b3db05af1 100644 --- a/dom/media/moz.build +++ b/dom/media/moz.build @@ -42,9 +42,6 @@ DIRS += [ 'standalone', ] -if CONFIG['MOZ_DIRECTSHOW']: - DIRS += ['directshow'] - if CONFIG['MOZ_ANDROID_OMX']: DIRS += ['android'] @@ -294,11 +291,6 @@ LOCAL_INCLUDES += [ '/netwerk/base', ] -if CONFIG['MOZ_DIRECTSHOW']: - LOCAL_INCLUDES += [ - '/media/webrtc/trunk/webrtc/modules/video_capture/windows', - ] - if CONFIG['MOZ_WEBRTC']: LOCAL_INCLUDES += [ '/media/webrtc/signaling/src/common', diff --git a/old-configure.in b/old-configure.in index 6b88a00af..547b71cbf 100644 --- a/old-configure.in +++ b/old-configure.in @@ -2204,7 +2204,6 @@ MOZ_VORBIS= MOZ_TREMOR= MOZ_SAMPLE_TYPE_FLOAT32= MOZ_SAMPLE_TYPE_S16= -MOZ_DIRECTSHOW= MOZ_WEBRTC= MOZ_PEERCONNECTION= MOZ_SRTP= @@ -2894,23 +2893,6 @@ fi fi # COMPILE_ENVIRONMENT dnl ======================================================== -dnl = DirectShow support -dnl ======================================================== -if test "$OS_ARCH" = "WINNT"; then - dnl Enable DirectShow support by default. - MOZ_DIRECTSHOW=1 -fi - -MOZ_ARG_DISABLE_BOOL(directshow, -[ --disable-directshow Disable support for DirectShow], - MOZ_DIRECTSHOW=, - MOZ_DIRECTSHOW=1) - -if test -n "$MOZ_DIRECTSHOW"; then - AC_DEFINE(MOZ_DIRECTSHOW) -fi; - -dnl ======================================================== dnl = EME support dnl ======================================================== @@ -5484,7 +5466,6 @@ AC_SUBST(MOZ_TREMOR) AC_SUBST(MOZ_FFVPX) AC_SUBST_LIST(FFVPX_ASFLAGS) AC_SUBST(MOZ_EME) -AC_SUBST(MOZ_DIRECTSHOW) AC_SUBST(MOZ_ANDROID_OMX) AC_SUBST(MOZ_OMX_PLUGIN) AC_SUBST(MOZ_VPX_ERROR_CONCEALMENT) diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build index 71f9a86de..624f8f54d 100644 --- a/toolkit/library/moz.build +++ b/toolkit/library/moz.build @@ -177,14 +177,6 @@ if CONFIG['MOZ_WMF']: 'strmiids', ] -if CONFIG['MOZ_DIRECTSHOW']: - OS_LIBS += [ - 'dmoguids', - 'wmcodecdspuuid', - 'strmiids', - 'msdmo', - ] - if CONFIG['OS_ARCH'] == 'FreeBSD': OS_LIBS += [ 'util', |