Make the dependency explicit and add lavresample to lavcodec's
pkg-config file if the opus decoder is enabled.
Change the linking order for our programs. Only noticed that one after
enabling the avresample neon clobber test.
---
Makefile | 2 +-
configure | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index b3680c2..9e7f1fc 100644
--- a/Makefile
+++ b/Makefile
@@ -84,8 +84,8 @@ TOOLS-$(CONFIG_ZLIB) += cws2fws
FFLIBS-$(CONFIG_AVDEVICE) += avdevice
FFLIBS-$(CONFIG_AVFILTER) += avfilter
FFLIBS-$(CONFIG_AVFORMAT) += avformat
-FFLIBS-$(CONFIG_AVRESAMPLE) += avresample
FFLIBS-$(CONFIG_AVCODEC) += avcodec
+FFLIBS-$(CONFIG_AVRESAMPLE) += avresample
FFLIBS-$(CONFIG_SWSCALE) += swscale
FFLIBS := avutil
diff --git a/configure b/configure
index d2d11dd..71b37e2 100755
--- a/configure
+++ b/configure
@@ -1808,6 +1808,7 @@ mxpeg_decoder_select="mjpeg_decoder"
nellymoser_decoder_select="mdct sinewin"
nellymoser_encoder_select="audio_frame_queue mdct sinewin"
nuv_decoder_select="dsputil lzo"
+opus_decoder_deps="avresample"
png_decoder_deps="zlib"
png_encoder_deps="zlib"
png_encoder_select="dsputil"
@@ -4666,13 +4667,16 @@ Cflags: -I\${includedir}
EOF
}
+lavc_libs="libavutil = $LIBAVUTIL_VERSION"
+enabled opus_decoder && prepend lavc_libs "libavresample >=
$LIBAVRESAMPLE_VERSION"
+
lavfi_libs="libavutil = $LIBAVUTIL_VERSION"
enabled movie_filter && prepend lavfi_libs "libavformat >=
$LIBAVFORMAT_VERSION, libavcodec >= $LIBAVCODEC_VERSION,"
enabled resample_filter && prepend lavfi_libs "libavresample >=
$LIBAVRESAMPLE_VERSION,"
enabled scale_filter && prepend lavfi_libs "libswscale >=
$LIBSWSCALE_VERSION,"
pkgconfig_generate libavutil "Libav utility library"
"$LIBAVUTIL_VERSION" "$LIBM"
-pkgconfig_generate libavcodec "Libav codec library"
"$LIBAVCODEC_VERSION" "$extralibs" "libavutil = $LIBAVUTIL_VERSION"
+pkgconfig_generate libavcodec "Libav codec library"
"$LIBAVCODEC_VERSION" "$extralibs" "$lavc_libs"
pkgconfig_generate libavformat "Libav container format library"
"$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec = $LIBAVCODEC_VERSION"
pkgconfig_generate libavdevice "Libav device handling library"
"$LIBAVDEVICE_VERSION" "$extralibs" "libavformat = $LIBAVFORMAT_VERSION"
pkgconfig_generate libavfilter "Libav video filtering library"
"$LIBAVFILTER_VERSION" "$extralibs" "$lavfi_libs"
--
1.9.2
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
