Attachment #399676 for bug #519258

View | Details | Raw Unified | Return to bug 519258
Collapse All | Expand All




            [AC_HELP_STRING([--with-system-libav], [use system Libav libraries])])

if test "x$with_system_libav" = "xyes"; then
  PKG_CHECK_MODULES(LIBAV, libavformat libavcodec libavresample libavutil)
  PKG_CHECK_MODULES(SWSCALE, libswscale libavutil)
  saved_CPPFLAGS="$CPPFLAGS"
  CPPFLAGS="$CPPFLAGS $LIBAV_CFLAGS"


  LIBAV_DEPS="\$(top_builddir)/gst-libs/ext/libav/libavformat/libavformat.a \
              \$(top_builddir)/gst-libs/ext/libav/libavcodec/libavcodec.a \
              \$(top_builddir)/gst-libs/ext/libav/libavresample/libavresample.a \
              \$(top_builddir)/gst-libs/ext/libav/libavutil/libavutil.a"
  if test "x$enable_static_plugins" = xyes; then
      dnl with static linking we can't use the .a archive directly as they would
      dnl be included in the final libgstlibav.a as a file and won't be usable.
      dnl libav*.a must be copied to the final destination too
      LIBAV_LIBS="-lavformat -lavcodec -lavresample -lavutil"
  else
      dnl libgstlibav.la: libs to statically link to
      LIBAV_LIBS="$LIBAV_DEPS"

Lines 176-182 gst_ffmpeg_idct_algo_get_type (void) Link Here

(-)a/ext/libav/gstavcfg.c (-2 / +1 lines)
176	{FF_IDCT_SH4, "SH4", "sh4"},	176	{FF_IDCT_SH4, "SH4", "sh4"},
177	{FF_IDCT_SIMPLEARM, "Simple ARM", "simplearm"},	177	{FF_IDCT_SIMPLEARM, "Simple ARM", "simplearm"},
178	{FF_IDCT_IPP, "IPP", "ipp"},	178	{FF_IDCT_IPP, "IPP", "ipp"},
179	{FF_IDCT_XVIDMMX, "XVID MMX", "xvidmmx"},	179	{FF_IDCT_XVID, "XVID", "xvid"},
180	{FF_IDCT_SIMPLEARMV5TE, "Simple ARMV5TE", "simplearmv5te"},	180	{FF_IDCT_SIMPLEARMV5TE, "Simple ARMV5TE", "simplearmv5te"},
181	{FF_IDCT_SIMPLEARMV6, "Simple ARMV6", "simplearmv6"},	181	{FF_IDCT_SIMPLEARMV6, "Simple ARMV6", "simplearmv6"},
182	{FF_IDCT_SIMPLEVIS, "Simple Vis", "simplevis"},	182	{FF_IDCT_SIMPLEVIS, "Simple Vis", "simplevis"},
183	-

Return to bug 519258

Lines 246-252 AC_ARG_WITH(system-libav, Link Here

(-)a/configure.ac (-2 / +3 lines)
246	[AC_HELP_STRING([--with-system-libav], [use system Libav libraries])])	246	[AC_HELP_STRING([--with-system-libav], [use system Libav libraries])])
247		247
248	if test "x$with_system_libav" = "xyes"; then	248	if test "x$with_system_libav" = "xyes"; then
249	PKG_CHECK_MODULES(LIBAV, libavformat libavcodec libavutil)	249	PKG_CHECK_MODULES(LIBAV, libavformat libavcodec libavresample libavutil)
250	PKG_CHECK_MODULES(SWSCALE, libswscale libavutil)	250	PKG_CHECK_MODULES(SWSCALE, libswscale libavutil)
251	saved_CPPFLAGS="$CPPFLAGS"	251	saved_CPPFLAGS="$CPPFLAGS"
252	CPPFLAGS="$CPPFLAGS $LIBAV_CFLAGS"	252	CPPFLAGS="$CPPFLAGS $LIBAV_CFLAGS"
Lines 265-276 else Link Here
265		265
266	LIBAV_DEPS="\$(top_builddir)/gst-libs/ext/libav/libavformat/libavformat.a \	266	LIBAV_DEPS="\$(top_builddir)/gst-libs/ext/libav/libavformat/libavformat.a \
267	\$(top_builddir)/gst-libs/ext/libav/libavcodec/libavcodec.a \	267	\$(top_builddir)/gst-libs/ext/libav/libavcodec/libavcodec.a \
		268	\$(top_builddir)/gst-libs/ext/libav/libavresample/libavresample.a \
268	\$(top_builddir)/gst-libs/ext/libav/libavutil/libavutil.a"	269	\$(top_builddir)/gst-libs/ext/libav/libavutil/libavutil.a"
269	if test "x$enable_static_plugins" = xyes; then	270	if test "x$enable_static_plugins" = xyes; then
270	dnl with static linking we can't use the .a archive directly as they would	271	dnl with static linking we can't use the .a archive directly as they would
271	dnl be included in the final libgstlibav.a as a file and won't be usable.	272	dnl be included in the final libgstlibav.a as a file and won't be usable.
272	dnl libav*.a must be copied to the final destination too	273	dnl libav*.a must be copied to the final destination too
273	LIBAV_LIBS="-lavformat -lavcodec -lavutil"	274	LIBAV_LIBS="-lavformat -lavcodec -lavresample -lavutil"
274	else	275	else
275	dnl libgstlibav.la: libs to statically link to	276	dnl libgstlibav.la: libs to statically link to
276	LIBAV_LIBS="$LIBAV_DEPS"	277	LIBAV_LIBS="$LIBAV_DEPS"