From c062d080b1acbe4d23f1cf45634a586c3dd19243 Mon Sep 17 00:00:00 2001 From: Jose Alberto Reguero Date: Sat, 8 Oct 2011 22:20:46 +0100 Subject: Build fix for Fedora with external FFmpeg. --- src/combined/ffmpeg/Makefile.am | 2 +- src/input/input_cdda.c | 2 +- src/video_out/Makefile.am | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/combined/ffmpeg/Makefile.am b/src/combined/ffmpeg/Makefile.am index c6509ed90..773353096 100644 --- a/src/combined/ffmpeg/Makefile.am +++ b/src/combined/ffmpeg/Makefile.am @@ -29,7 +29,7 @@ xineplug_decode_ff_la_LDFLAGS = $(AM_LDFLAGS) $(IMPURE_TEXT_LDFLAGS) # Generation of ffmpeg->xine codec mapping lists (see xine_*.list). -AV_CPP = $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) +AV_CPP = $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AVUTIL_CFLAGS) # Extract some CODEC_ID_* from avcodec.h. Requires some sed mangling. avcodec_audio.list: AV_CODECS:=/CODEC_ID_PCM_S16LE/,/CODEC_ID_DVD_SUBTITLE/ diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c index 20129706d..568e021f5 100644 --- a/src/input/input_cdda.c +++ b/src/input/input_cdda.c @@ -104,7 +104,7 @@ #define CD_LEADOUT_TRACK 0xAA #define CD_BLOCK_OFFSET 150 -#if defined(HAVE_LIBAVUTIL_SHA1_H) && !defined(HAVE_LIBAVUTIL_SHA_H) +#if !defined(HAVE_LIBAVUTIL_SHA_H) /* old libavutil/sha1.h was found... */ #define AVSHA AVSHA1 # define av_sha_init(c,b) av_sha1_init(c) diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am index 45a6f0338..1e18a6f02 100644 --- a/src/video_out/Makefile.am +++ b/src/video_out/Makefile.am @@ -122,7 +122,7 @@ xineplug_LTLIBRARIES = $(xshm_module) $(xv_module) $(xvmc_module) \ xineplug_vo_out_vdpau_la_SOURCES = video_out_vdpau.c xineplug_vo_out_vdpau_la_LIBADD = $(YUV_LIBS) $(PTHREAD_LIBS) $(X_LIBS) $(LTLIBINTL) $(VDPAU_LIBS) -lm -xineplug_vo_out_vdpau_la_CFLAGS = $(VISIBILITY_FLAG) $(MLIB_CFLAGS) $(X_CFLAGS) $(VDPAU_CFLAGS) +xineplug_vo_out_vdpau_la_CFLAGS = $(VISIBILITY_FLAG) $(MLIB_CFLAGS) $(X_CFLAGS) $(VDPAU_CFLAGS) $(AVUTIL_CFLAGS) xineplug_vo_out_xcbshm_la_SOURCES = video_out_xcbshm.c $(XCBOSD) xineplug_vo_out_xcbshm_la_LIBADD = $(YUV_LIBS) $(PTHREAD_LIBS) $(XCB_LIBS) $(XCBSHM_LIBS) $(LTLIBINTL) -- cgit v1.2.3