Attachment #564598 for bug #677610

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

Lines 664-669 Link Here

(-)gst-plugins-good-1.14.4/configure.local (+84 lines)
664	WAVPACK_CFLAGS	664	WAVPACK_CFLAGS
665	USE_VPX_FALSE	665	USE_VPX_FALSE
666	USE_VPX_TRUE	666	USE_VPX_TRUE
		667	VPX_180_LIBS
		668	VPX_180_CFLAGS
667	VPX_140_LIBS	669	VPX_140_LIBS
668	VPX_140_CFLAGS	670	VPX_140_CFLAGS
669	VPX_130_LIBS	671	VPX_130_LIBS
Lines 1495-1500 Link Here
1495	VPX_130_LIBS	1497	VPX_130_LIBS
1496	VPX_140_CFLAGS	1498	VPX_140_CFLAGS
1497	VPX_140_LIBS	1499	VPX_140_LIBS
		1500	VPX_180_CFLAGS
		1501	VPX_180_LIBS
1498	WAVPACK_CFLAGS	1502	WAVPACK_CFLAGS
1499	WAVPACK_LIBS'	1503	WAVPACK_LIBS'
1500		1504
Lines 2468-2473 Link Here
2468	C compiler flags for VPX_140, overriding pkg-config	2472	C compiler flags for VPX_140, overriding pkg-config
2469	VPX_140_LIBS	2473	VPX_140_LIBS
2470	linker flags for VPX_140, overriding pkg-config	2474	linker flags for VPX_140, overriding pkg-config
		2475	VPX_180_CFLAGS
		2476	C compiler flags for VPX_180, overriding pkg-config
		2477	VPX_180_LIBS
		2478	linker flags for VPX_180, overriding pkg-config
2471	WAVPACK_CFLAGS	2479	WAVPACK_CFLAGS
2472	C compiler flags for WAVPACK, overriding pkg-config	2480	C compiler flags for WAVPACK, overriding pkg-config
2473	WAVPACK_LIBS	2481	WAVPACK_LIBS
Lines 37799-37804 Link Here
37799		37807
37800		37808
37801	fi	37809	fi
		37810
		37811
		37812	pkg_failed=no
		37813	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VPX_180" >&5
		37814	$as_echo_n "checking for VPX_180... " >&6; }
		37815
		37816	if test -n "$PKG_CONFIG"; then
		37817	if test -n "$VPX_180_CFLAGS"; then
		37818	pkg_cv_VPX_180_CFLAGS="$VPX_180_CFLAGS"
		37819	else
		37820	if test -n "$PKG_CONFIG" && \
		37821	{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vpx >= 1.8.0\""; } >&5
		37822	($PKG_CONFIG --exists --print-errors "vpx >= 1.8.0") 2>&5
		37823	ac_status=$?
		37824	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
		37825	test $ac_status = 0; }; then
		37826	pkg_cv_VPX_180_CFLAGS=`$PKG_CONFIG --cflags "vpx >= 1.8.0" 2>/dev/null`
		37827	else
		37828	pkg_failed=yes
		37829	fi
		37830	fi
		37831	else
		37832	pkg_failed=untried
		37833	fi
		37834	if test -n "$PKG_CONFIG"; then
		37835	if test -n "$VPX_180_LIBS"; then
		37836	pkg_cv_VPX_180_LIBS="$VPX_180_LIBS"
		37837	else
		37838	if test -n "$PKG_CONFIG" && \
		37839	{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vpx >= 1.8.0\""; } >&5
		37840	($PKG_CONFIG --exists --print-errors "vpx >= 1.8.0") 2>&5
		37841	ac_status=$?
		37842	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
		37843	test $ac_status = 0; }; then
		37844	pkg_cv_VPX_180_LIBS=`$PKG_CONFIG --libs "vpx >= 1.8.0" 2>/dev/null`
		37845	else
		37846	pkg_failed=yes
		37847	fi
		37848	fi
		37849	else
		37850	pkg_failed=untried
		37851	fi
		37852
		37853
		37854
		37855	if test $pkg_failed = yes; then
		37856
		37857	if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
		37858	_pkg_short_errors_supported=yes
		37859	else
		37860	_pkg_short_errors_supported=no
		37861	fi
		37862	if test $_pkg_short_errors_supported = yes; then
		37863	VPX_180_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "vpx >= 1.8.0"`
		37864	else
		37865	VPX_180_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "vpx >= 1.8.0"`
		37866	fi
		37867	# Put the nasty error message in config.log where it belongs
		37868	echo "$VPX_180_PKG_ERRORS" >&5
		37869
		37870	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
		37871	$as_echo "no" >&6; }
		37872	true
		37873	elif test $pkg_failed = untried; then
37874	true
37875	else
37876	VPX_180_CFLAGS=$pkg_cv_VPX_180_CFLAGS
37877	VPX_180_LIBS=$pkg_cv_VPX_180_LIBS
37878	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
37879	$as_echo "yes" >&6; }
37880
37881
37882	$as_echo "#define HAVE_VPX_1_8 1" >>confdefs.h
37883
37884
37885	fi
37802		37886
37803	LIBS="$OLD_LIBS"	37887	LIBS="$OLD_LIBS"
37804	CFLAGS="$OLD_CFLAGS"	37888	CFLAGS="$OLD_CFLAGS"

Lines 62-67 Link Here

(-)gst-plugins-good-1.14.4/ext/vpx/gstvpxdec.c.old (+2 lines)
62	{C_FLAGS (VP8_DEBLOCK), "Deblock", "deblock"},	62	{C_FLAGS (VP8_DEBLOCK), "Deblock", "deblock"},
63	{C_FLAGS (VP8_DEMACROBLOCK), "Demacroblock", "demacroblock"},	63	{C_FLAGS (VP8_DEMACROBLOCK), "Demacroblock", "demacroblock"},
64	{C_FLAGS (VP8_ADDNOISE), "Add noise", "addnoise"},	64	{C_FLAGS (VP8_ADDNOISE), "Add noise", "addnoise"},
		65	#ifndef HAVE_VPX_1_8
65	{C_FLAGS (VP8_DEBUG_TXT_FRAME_INFO),	66	{C_FLAGS (VP8_DEBUG_TXT_FRAME_INFO),
66	"Print frame information",	67	"Print frame information",
67	"visualize-frame-info"},	68	"visualize-frame-info"},
Lines 74-79 Link Here
74	{C_FLAGS (VP8_DEBUG_TXT_RATE_INFO),	75	{C_FLAGS (VP8_DEBUG_TXT_RATE_INFO),
75	"Print video rate info",	76	"Print video rate info",
76	"visualize-rate-info"},	77	"visualize-rate-info"},
		78	#endif
77	{C_FLAGS (VP8_MFQE), "Multi-frame quality enhancement", "mfqe"},	79	{C_FLAGS (VP8_MFQE), "Multi-frame quality enhancement", "mfqe"},
78	{0, NULL, NULL}	80	{0, NULL, NULL}
79	};	81	};

Lines 389-394 Link Here

(-)gst-plugins-good-1.14.4/config.h.in.old (+3 lines)
389	/* Defined if the VPX library version is 1.4 or bigger */	389	/* Defined if the VPX library version is 1.4 or bigger */
390	#undef HAVE_VPX_1_4	390	#undef HAVE_VPX_1_4
391		391
		392	/* Defined if the VPX library version is 1.8 or bigger */
		393	#undef HAVE_VPX_1_8
		394
392	/* Define to enable Win32 WaveForm (used by waveformsink). */	395	/* Define to enable Win32 WaveForm (used by waveformsink). */
393	#undef HAVE_WAVEFORM	396	#undef HAVE_WAVEFORM
394		397

Return to bug 677610