From 24ac3c3cd129ceb6e181e9f36c2ade5e3ec82cc4 Mon Sep 17 00:00:00 2001 From: Chris Rankin Date: Thu, 6 Mar 2008 14:16:09 +0000 Subject: CVS broken with built-in ffmpeg I can no longer build libxine from CVS, unless I apply this patch. I do not have ffmpeg installed, and so am using the built-in ffmpeg instead (I think). --HG-- extra : transplant_source : %96v8%CE%21%82%CCh%0A%83%0C%BC%C5%91F%89W%E4%B8%AE --- src/libffmpeg/Makefile.am | 2 +- src/post/planar/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/libffmpeg/Makefile.am b/src/libffmpeg/Makefile.am index 96d269278..d2be74c39 100644 --- a/src/libffmpeg/Makefile.am +++ b/src/libffmpeg/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/misc/Makefile.common -DEFAULT_INCLUDES = -I. +DEFAULT_INCLUDES = -I. -Ilibavcodec if HAVE_FFMPEG AM_CFLAGS = $(FFMPEG_CFLAGS) $(FFMPEG_POSTPROC_CFLAGS) diff --git a/src/post/planar/Makefile.am b/src/post/planar/Makefile.am index 4ba6bfa41..36405bfc2 100644 --- a/src/post/planar/Makefile.am +++ b/src/post/planar/Makefile.am @@ -6,7 +6,7 @@ if HAVE_FFMPEG postproc_lib = $(FFMPEG_POSTPROC_LIBS) ff_cflags = $(FFMPEG_POSTPROC_CFLAGS) else -ff_cflags = -I$(top_srcdir)/src/libffmpeg/libavcodec/libpostproc +ff_cflags = -I$(top_srcdir)/src/libffmpeg/libavcodec postproc_lib = $(POSTPROC_INT_LIB) postproc_dep = $(postproc_lib) endif -- cgit v1.2.3