Module: libav
Branch: release/9
Commit: 0f8b3f17114f75cde68b6848c8f1437f7fdce44e

Author:    Diego Biurrun <[email protected]>
Committer: Diego Biurrun <[email protected]>
Date:      Sat Apr 27 14:51:27 2013 +0200

build: output-example: Add avutil to ELIBS in link command

output-example links against swscale, which depends on avutil.  In standard
configurations, by pure good luck, the libs before swscale pull in all of
swscale's dependencies and linking succeeds.  However, in some configurations
like --disable-asm this is not the case and linking fails.

Hardcode the dependency to avoid a more general Makefile refactoring.

(cherry picked from commit 4d7ed3e73541983459a7913c2034eba69ebc113d)
Signed-off-by: Diego Biurrun <[email protected]>

---

 libavformat/Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/Makefile b/libavformat/Makefile
index 2553b8d..9b6a23b 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -385,4 +385,4 @@ TOOLS     = aviocat                                         
            \
             pktdumper                                                   \
             probetest                                                   \
 
-$(SUBDIR)output-example$(EXESUF): ELIBS = $(patsubst %,$(LD_LIB),swscale)
+$(SUBDIR)output-example$(EXESUF): ELIBS = $(patsubst %,$(LD_LIB),swscale 
avutil)

_______________________________________________
libav-commits mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-commits

Reply via email to