diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-04 23:53:39 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-04 23:53:39 +0200 |
| commit | ca897ff0f84cdc7fc83449d1d06dcc9528edbb97 (patch) | |
| tree | 313c6245e23b257a05f220c65c6cdf2d474323be /src/libmpeg2 | |
| parent | 60a408c3446733dc752979c1eab579c25a4a4897 (diff) | |
| parent | f5dc5087a79d813259a674bd96ba4dea43fb254c (diff) | |
| download | xine-lib-ca897ff0f84cdc7fc83449d1d06dcc9528edbb97.tar.gz xine-lib-ca897ff0f84cdc7fc83449d1d06dcc9528edbb97.tar.bz2 | |
Merge with main repository.
--HG--
rename : src/libffmpeg/dvaudio_decoder.c => src/libffmpeg/ff_dvaudio_decoder.c
rename : src/libffmpeg/video_decoder.c => src/libffmpeg/ff_video_decoder.c
rename : src/libffmpeg/xine_decoder.h => src/libffmpeg/ffmpeg_decoder.h
rename : src/libffmpeg/xine_encoder.c => src/libffmpeg/ffmpeg_encoder.c
Diffstat (limited to 'src/libmpeg2')
| -rw-r--r-- | src/libmpeg2/Makefile.am | 12 | ||||
| -rw-r--r-- | src/libmpeg2/xine_mpeg2_decoder.c (renamed from src/libmpeg2/xine_decoder.c) | 0 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/libmpeg2/Makefile.am b/src/libmpeg2/Makefile.am index 550ce581f..66fb39f13 100644 --- a/src/libmpeg2/Makefile.am +++ b/src/libmpeg2/Makefile.am @@ -1,10 +1,6 @@ include $(top_srcdir)/misc/Makefile.common -AM_CFLAGS = $(LIBMPEG2_CFLAGS) - -libdir = $(XINE_PLUGINDIR) - -lib_LTLIBRARIES = xineplug_decode_mpeg2.la +xineplug_LTLIBRARIES = xineplug_decode_mpeg2.la xineplug_decode_mpeg2_la_SOURCES = \ cpu_state.c \ @@ -23,12 +19,12 @@ xineplug_decode_mpeg2_la_SOURCES = \ slice_xvmc.c \ slice_xvmc_vld.c \ stats.c \ - xine_decoder.c \ + xine_mpeg2_decoder.c \ libmpeg2_accel.c xineplug_decode_mpeg2_la_LIBADD = $(MLIB_LIBS) $(XINE_LIB) -lm -xineplug_decode_mpeg2_la_CFLAGS = $(VISIBILITY_FLAG) -xineplug_decode_mpeg2_la_LDFLAGS = -avoid-version -module +xineplug_decode_mpeg2_la_CFLAGS = $(VISIBILITY_FLAG) $(LIBMPEG2_CFLAGS) +xineplug_decode_mpeg2_la_LDFLAGS = $(xineplug_ldflags) noinst_HEADERS = vlc.h mpeg2.h xvmc.h xvmc_vld.h mpeg2_internal.h idct_mlib.h vis.h \ libmpeg2_accel.h diff --git a/src/libmpeg2/xine_decoder.c b/src/libmpeg2/xine_mpeg2_decoder.c index 8c0d176c0..8c0d176c0 100644 --- a/src/libmpeg2/xine_decoder.c +++ b/src/libmpeg2/xine_mpeg2_decoder.c |