diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-12-22 23:18:37 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-12-22 23:18:37 +0100 |
| commit | 0ff96f3986d9c31edd14182e22b498a674571f9c (patch) | |
| tree | 70e894f50831d9c91986921d301042e4be5492f4 /src/libffmpeg/Makefile.am | |
| parent | c57821405a657216e41e9c9e8ddaed9996af2350 (diff) | |
| download | xine-lib-0ff96f3986d9c31edd14182e22b498a674571f9c.tar.gz xine-lib-0ff96f3986d9c31edd14182e22b498a674571f9c.tar.bz2 | |
Move libffmpeg into combined/ffmpeg directory.
--HG--
rename : src/libffmpeg/Makefile.am => src/combined/ffmpeg/Makefile.am
rename : src/libffmpeg/ff_audio_decoder.c => src/combined/ffmpeg/ff_audio_decoder.c
rename : src/libffmpeg/ff_dvaudio_decoder.c => src/combined/ffmpeg/ff_dvaudio_decoder.c
rename : src/libffmpeg/ff_mpeg_parser.c => src/combined/ffmpeg/ff_mpeg_parser.c
rename : src/libffmpeg/ff_mpeg_parser.h => src/combined/ffmpeg/ff_mpeg_parser.h
rename : src/libffmpeg/ff_video_decoder.c => src/combined/ffmpeg/ff_video_decoder.c
rename : src/libffmpeg/ffmpeg_decoder.c => src/combined/ffmpeg/ffmpeg_decoder.c
rename : src/libffmpeg/ffmpeg_decoder.h => src/combined/ffmpeg/ffmpeg_decoder.h
rename : src/libffmpeg/ffmpeg_encoder.c => src/combined/ffmpeg/ffmpeg_encoder.c
Diffstat (limited to 'src/libffmpeg/Makefile.am')
| -rw-r--r-- | src/libffmpeg/Makefile.am | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/src/libffmpeg/Makefile.am b/src/libffmpeg/Makefile.am deleted file mode 100644 index 42fe20f95..000000000 --- a/src/libffmpeg/Makefile.am +++ /dev/null @@ -1,62 +0,0 @@ -include $(top_srcdir)/misc/Makefile.common - -AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) -AM_CPPFLAGS = $(ZLIB_CPPFLAGS) -AM_LDFLAGS = $(xineplug_ldflags) - -if WITH_EXTERNAL_FFMPEG -AM_CFLAGS += $(FFMPEG_CFLAGS) $(FFMPEG_POSTPROC_CFLAGS) -link_ffmpeg = $(FFMPEG_LIBS) $(FFMPEG_POSTPROC_LIBS) -else -AM_CPPFLAGS += -I$(top_srcdir)/contrib/ffmpeg/libavutil \ - -I$(top_srcdir)/contrib/ffmpeg/libavcodec \ - -I$(top_srcdir)/contrib/ffmpeg/libpostproc -link_ffmpeg = $(top_builddir)/contrib/ffmpeg/libavcodec/libavcodec.a \ - $(top_builddir)/contrib/ffmpeg/libavutil/libavutil.a \ - $(top_builddir)/contrib/ffmpeg/libpostproc/libpostproc.a - -$(top_builddir)/contrib/ffmpeg/libavcodec/libavcodec.a: - $(MAKE) -C $(top_builddir)/contrib/ ffmpeg/libavcodec/libavcodec.a - -$(top_builddir)/contrib/ffmpeg/libavutil/libavutil.a: - $(MAKE) -C $(top_builddir)/contrib/ ffmpeg/libavutil/libavutil.a - -$(top_builddir)/contrib/ffmpeg/libpostproc/libpostproc.a: - $(MAKE) -C $(top_builddir)/contrib/ ffmpeg/libpostproc/libpostproc.a - -$(top_builddir)/contrib/ffmpeg/config.h: - $(MAKE) -C $(top_builddir)/contrib/ ffmpeg/config.mak - -ffmpeg_config.h: $(top_builddir)/contrib/ffmpeg/config.h - cp $(top_builddir)/contrib/ffmpeg/config.h ffmpeg_config.h - -BUILT_SOURCES = ffmpeg_config.h -CLEANFILES = $(BUILT_SOURCES) - -endif - -# this must always be included, even if the current machine has no DXR3... -EXTRA_DIST = ffmpeg_encoder.c - -xineplug_LTLIBRARIES = xineplug_decode_ff.la xineplug_decode_dvaudio.la - -if ENABLE_DXR3 -AM_CFLAGS += $(X_CFLAGS) -AM_CPPFLAGS += -I$(top_srcdir)/src/dxr3 -xineplug_decode_ff_la_SOURCES = ffmpeg_decoder.c ff_audio_decoder.c ff_video_decoder.c \ - ffmpeg_encoder.c ff_mpeg_parser.c ffmpeg_decoder.h \ - ff_mpeg_parser.h -else -xineplug_decode_ff_la_SOURCES = ffmpeg_decoder.c ff_audio_decoder.c ff_video_decoder.c \ - ff_mpeg_parser.c ffmpeg_decoder.h ff_mpeg_parser.h -endif - -nodist_xineplug_decode_ff_la_SOURCES = ffmpeg_config.h - -xineplug_decode_ff_la_LIBADD = $(MLIB_LIBS) $(XINE_LIB) -lm $(ZLIB_LIBS) \ - $(link_ffmpeg) $(PTHREAD_LIBS) $(LTLIBINTL) -xineplug_decode_ff_la_LDFLAGS = $(AM_LDFLAGS) $(IMPURE_TEXT_LDFLAGS) - -xineplug_decode_dvaudio_la_SOURCES = ff_dvaudio_decoder.c -xineplug_decode_dvaudio_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) -xineplug_decode_dvaudio_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/contrib/ffmpeg/libavcodec |