Lines 46-52
diff --git media/ffvpx/libavcodec/moz.build media/ffvpx/libavcodec/moz.build
Link Here
|
46 |
index 761fc8cf4cd9..793a5b8697a8 100644 |
46 |
index 761fc8cf4cd9..793a5b8697a8 100644 |
47 |
--- media/ffvpx/libavcodec/moz.build |
47 |
--- media/ffvpx/libavcodec/moz.build |
48 |
+++ media/ffvpx/libavcodec/moz.build |
48 |
+++ media/ffvpx/libavcodec/moz.build |
49 |
@@ -120,10 +120,14 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']: |
49 |
@@ -119,10 +119,17 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']: |
50 |
'vp9recon.c', |
50 |
'vp9recon.c', |
51 |
'vpx_rac.c', |
51 |
'vpx_rac.c', |
52 |
] |
52 |
] |
Lines 57-66
index 761fc8cf4cd9..793a5b8697a8 100644
Link Here
|
57 |
+ if CONFIG["MOZ_SYSTEM_AV1"]: |
57 |
+ if CONFIG["MOZ_SYSTEM_AV1"]: |
58 |
+ CFLAGS += CONFIG['MOZ_SYSTEM_LIBDAV1D_CFLAGS'] |
58 |
+ CFLAGS += CONFIG['MOZ_SYSTEM_LIBDAV1D_CFLAGS'] |
59 |
+ OS_LIBS += CONFIG['MOZ_SYSTEM_LIBDAV1D_LIBS'] |
59 |
+ OS_LIBS += CONFIG['MOZ_SYSTEM_LIBDAV1D_LIBS'] |
|
|
60 |
+ CFLAGS += CONFIG['MOZ_SYSTEM_LIBAOM_CFLAGS'] |
61 |
+ OS_LIBS += CONFIG['MOZ_SYSTEM_LIBAOM_LIBS'] |
60 |
+ else: |
62 |
+ else: |
61 |
+ USE_LIBS += [ |
63 |
+ USE_LIBS += [ |
62 |
+ 'dav1d', |
64 |
+ 'dav1d', |
63 |
+ 'media_libdav1d_asm', |
65 |
+ 'media_libdav1d_asm', |
|
|
66 |
+ 'aom', |
64 |
+ ] |
67 |
+ ] |
65 |
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": |
68 |
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": |
66 |
LOCAL_INCLUDES += ['/media/mozva'] |
69 |
LOCAL_INCLUDES += ['/media/mozva'] |