diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2005-10-23 02:11:16 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2005-10-23 02:11:16 +0000 |
| commit | 712a40b59a0f451a558d88db1f9f124463016f97 (patch) | |
| tree | 82bc80e9b7a5ba09c01acf205c8ac1e20c44914f /src/libffmpeg/Makefile.am | |
| parent | 640063a719556f8569fe848528b39660c6fc31a6 (diff) | |
| download | xine-lib-712a40b59a0f451a558d88db1f9f124463016f97.tar.gz xine-lib-712a40b59a0f451a558d88db1f9f124463016f97.tar.bz2 | |
big ffmpeg update
it is likely to break, so please keep both pieces
CVS patchset: 7767
CVS date: 2005/10/23 02:11:16
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 a5c23ba4e..819dd048f 100644 --- a/src/libffmpeg/Makefile.am +++ b/src/libffmpeg/Makefile.am @@ -6,8 +6,9 @@ link_ffmpeg = $(FFMPEG_LIBS) else link_ffmpeg = \ $(top_builddir)/src/libffmpeg/libavcodec/libavcodec.la \ + $(top_builddir)/src/libffmpeg/libavutil/libavutil.la \ $(top_builddir)/src/libffmpeg/libavcodec/libpostproc/libpostprocess.la -SUBDIRS = libavcodec +SUBDIRS = libavcodec libavutil endif # this must always be included, even if the current machine has no DXR3... @@ -21,7 +22,7 @@ lib_LTLIBRARIES = xineplug_decode_ff.la xineplug_decode_dvaudio.la if HAVE_DXR3 AM_CPPFLAGS = -I$(top_srcdir)/src/dxr3 $(X_CFLAGS) $(ff_cppflags) \ - $(ZLIB_CPPFLAGS) + $(ZLIB_CPPFLAGS) -Ilibavutil 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 @@ -29,7 +30,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) $(ZLIB_CPPFLAGS) +AM_CPPFLAGS = $(ff_cppflags) $(ZLIB_CPPFLAGS) -Ilibavutil 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@ |