diff options
Diffstat (limited to 'src/libffmpeg/Makefile.am')
| -rw-r--r-- | src/libffmpeg/Makefile.am | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/libffmpeg/Makefile.am b/src/libffmpeg/Makefile.am index 5927fbebc..a5c23ba4e 100644 --- a/src/libffmpeg/Makefile.am +++ b/src/libffmpeg/Makefile.am @@ -1,7 +1,7 @@ include $(top_srcdir)/misc/Makefile.common if HAVE_FFMPEG -FF_CPPFLAGS = $(FFMPEG_CPPFLAGS) +ff_cppflags = $(FFMPEG_CPPFLAGS) link_ffmpeg = $(FFMPEG_LIBS) else link_ffmpeg = \ @@ -20,7 +20,8 @@ libdir = $(XINE_PLUGINDIR) lib_LTLIBRARIES = xineplug_decode_ff.la xineplug_decode_dvaudio.la if HAVE_DXR3 -AM_CPPFLAGS = -I$(top_srcdir)/src/dxr3 $(X_CFLAGS) $(FF_CPPFLAGS) +AM_CPPFLAGS = -I$(top_srcdir)/src/dxr3 $(X_CFLAGS) $(ff_cppflags) \ + $(ZLIB_CPPFLAGS) xineplug_decode_ff_la_SOURCES = xine_decoder.c audio_decoder.c video_decoder.c \ xine_encoder.c mpeg_parser.c # The dxr3 uses ffmpegs MPEG encoder by dlopen()ing the ffmpeg plugin and @@ -28,7 +29,7 @@ xineplug_decode_ff_la_SOURCES = xine_decoder.c audio_decoder.c video_decoder.c \ # symbols and cannot use @XINE_PLUGIN_MIN_SYMS@ xineplug_decode_ff_la_LDFLAGS = -avoid-version -module else -AM_CPPFLAGS = $(FF_CPPFLAGS) +AM_CPPFLAGS = $(ff_cppflags) $(ZLIB_CPPFLAGS) xineplug_decode_ff_la_SOURCES = xine_decoder.c audio_decoder.c video_decoder.c \ mpeg_parser.c xineplug_decode_ff_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ |