diff options
| author | Robin KAY <komadori@users.sourceforge.net> | 2003-05-28 01:52:19 +0000 |
|---|---|---|
| committer | Robin KAY <komadori@users.sourceforge.net> | 2003-05-28 01:52:19 +0000 |
| commit | 021b744ff04ad653e15756afc244b74e8066103d (patch) | |
| tree | 356ce9bc930c9cc4e555d7c6b76c3d0a9ce14c04 /src/libffmpeg | |
| parent | da5b8a9ea501974bc58c513335bf149eea585bcd (diff) | |
| download | xine-lib-021b744ff04ad653e15756afc244b74e8066103d.tar.gz xine-lib-021b744ff04ad653e15756afc244b74e8066103d.tar.bz2 | |
Disable ffmpeg's encoder when HAVE_DXR3 is not defined. Remove dxr3 build hack.
CVS patchset: 4964
CVS date: 2003/05/28 01:52:19
Diffstat (limited to 'src/libffmpeg')
| -rw-r--r-- | src/libffmpeg/Makefile.am | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/libffmpeg/Makefile.am b/src/libffmpeg/Makefile.am index 45e97dcaa..0ef516358 100644 --- a/src/libffmpeg/Makefile.am +++ b/src/libffmpeg/Makefile.am @@ -12,12 +12,17 @@ libdir = $(XINE_PLUGINDIR) lib_LTLIBRARIES = xineplug_decode_ff.la +if HAVE_DXR3 xineplug_decode_ff_la_SOURCES = xine_decoder.c xine_encoder.c # The dxr3 uses ffmpegs MPEG encoder by dlopen()ing the ffmpeg plugin and # dlsym()ing the necessary function. Therefore we must allow more exported # symbols and cannot use @XINE_PLUGIN_MIN_SYMS@ -#xineplug_decode_ff_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ xineplug_decode_ff_la_LDFLAGS = -avoid-version -module +else +xineplug_decode_ff_la_SOURCES = xine_decoder.c +xineplug_decode_ff_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ +endif + xineplug_decode_ff_la_LIBADD = $(XINE_LIB) \ $(top_builddir)/src/libffmpeg/libavcodec/libavcodec.la \ $(top_builddir)/src/libffmpeg/libavcodec/libpostproc/libpostprocess.la |