diff options
| author | Chris Rankin <rankincj@yahoo.com> | 2008-03-06 14:16:09 +0000 |
|---|---|---|
| committer | Chris Rankin <rankincj@yahoo.com> | 2008-03-06 14:16:09 +0000 |
| commit | 24ac3c3cd129ceb6e181e9f36c2ade5e3ec82cc4 (patch) | |
| tree | a5fcf4e337f7d1862c1b8d264f3462dc17dd07e0 | |
| parent | c1d4212fe2fa0f85246e47505b6887e66884cb6b (diff) | |
| download | xine-lib-24ac3c3cd129ceb6e181e9f36c2ade5e3ec82cc4.tar.gz xine-lib-24ac3c3cd129ceb6e181e9f36c2ade5e3ec82cc4.tar.bz2 | |
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
| -rw-r--r-- | src/libffmpeg/Makefile.am | 2 | ||||
| -rw-r--r-- | src/post/planar/Makefile.am | 2 |
2 files changed, 2 insertions, 2 deletions
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 |