From: Bradley Sepos <bradley@bradleysepos.com>
Date: Fri, 2 Sep 2016 09:03:30 +0000 (-0400)
Subject: contrib: Fix libav not finding opus on certain versions of OS X.
X-Git-Tag: 1.0.0~252
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aef9c01792bae5c656a6e026b31187cd4b9062d0;p=handbrake

contrib: Fix libav not finding opus on certain versions of OS X.

This is needed for libav 12, anyway.
---

diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs
index 655df0651..ccb61eca1 100644
--- a/contrib/ffmpeg/module.defs
+++ b/contrib/ffmpeg/module.defs
@@ -18,9 +18,10 @@ FFMPEG.FETCH.md5 =  1a2eb461b98e0f1d1d6c4d892d51ac9b
 #FFMPEG.FETCH.md5 = 133fab51636f47d01c25b80f33f6ae3f
 
 FFMPEG.CONFIGURE.deps  =
-FFMPEG.CONFIGURE.env   =
 FFMPEG.CONFIGURE.host  =
 FFMPEG.CONFIGURE.build =
+FFMPEG.CONFIGURE.env.LOCAL_PATH = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
+FFMPEG.BUILD.env = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
 
 FFMPEG.CONFIGURE.extra = \
     --enable-gpl \
@@ -143,8 +144,3 @@ endif
 ifeq (solaris-sparc,$(BUILD.system)-$(BUILD.machine))
     FFMPEG.CONFIGURE.extra += --disable-demuxer=mpc8
 endif
-
-ifeq (1,$(FEATURE.local_yasm))
-    FFMPEG.CONFIGURE.env = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
-    FFMPEG.BUILD.env = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
-endif