From 4550d0f96435051156d17b7c31b02b22d269fd08 Mon Sep 17 00:00:00 2001 From: Damjan Jovanovic Date: Sun, 18 Dec 2016 21:16:34 +0000 Subject: DirectShow moved from DirectX to the Windows API MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit at least 10 years ago, so don't require DirectX to build the avmediawin library which uses DirectShow. Patch by: me (cherry picked from commit 8a8dd41ed0bc8c9ecf1faa27761a56b5a8fedcc2) Change-Id: I10926cb3c34bf3986c0341c1151360f1dfd5a21e Reviewed-on: https://gerrit.libreoffice.org/32411 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- postprocess/Rdb_services.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'postprocess') diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index 597245826dee..e999d053bade 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -137,6 +137,7 @@ $(eval $(call gb_Rdb_add_components,services,\ vcl/vcl.macosx \ ) \ $(if $(filter WNT,$(OS)), \ + avmedia/source/win/avmediawin \ dtrans/source/generic/dtrans \ dtrans/util/dnd \ dtrans/util/ftransl \ @@ -188,7 +189,6 @@ $(eval $(call gb_Rdb_add_components,services,\ canvas/source/cairo/cairocanvas \ ) \ $(if $(ENABLE_DIRECTX), \ - avmedia/source/win/avmediawin \ canvas/source/directx/directx9canvas \ canvas/source/directx/gdipluscanvas \ ) \ -- cgit