Mercurial > mplayer.hg
diff Makefile @ 32142:4614728cab25
build system: Merge all FFmpeg library checks into a single FFmpeg check.
There is little point in assuming that some parts of FFmpeg might be
available without the others. Plus, mixing and matching static and
shared FFmpeg libraries was never supported.
| author | diego |
|---|---|
| date | Mon, 13 Sep 2010 18:19:25 +0000 |
| parents | 184969a3a437 |
| children | 41c11d96b5db |
line wrap: on
line diff
--- a/Makefile Mon Sep 13 18:09:29 2010 +0000 +++ b/Makefile Mon Sep 13 18:19:25 2010 +0000 @@ -98,6 +98,27 @@ libfaad2/tns.c \ SRCS_COMMON-$(FASTMEMCPY) += libvo/aclib.c +SRCS_COMMON-$(FFMPEG) += av_opts.c \ + av_sub.c \ + libaf/af_lavcresample.c \ + libmpcodecs/ad_ffmpeg.c \ + libmpcodecs/vd_ffmpeg.c \ + libmpcodecs/vf_lavc.c \ + libmpcodecs/vf_lavcdeint.c \ + libmpcodecs/vf_pp.c \ + libmpcodecs/vf_screenshot.c \ + libmpdemux/demux_lavf.c \ + stream/stream_ffmpeg.c \ + +# These filters use private headers and do not work with shared FFmpeg. +SRCS_COMMON-$(FFMPEG_A) += libaf/af_lavcac3enc.c \ + libmpcodecs/vf_fspp.c \ + libmpcodecs/vf_geq.c \ + libmpcodecs/vf_mcdeint.c \ + libmpcodecs/vf_qp.c \ + libmpcodecs/vf_spp.c \ + libmpcodecs/vf_uspp.c \ + SRCS_COMMON-$(FREETYPE) += libvo/font_load_ft.c SRCS_COMMON-$(FTP) += stream/stream_ftp.c SRCS_COMMON-$(GIF) += libmpdemux/demux_gif.c @@ -123,27 +144,6 @@ libass/ass_strtod.c \ libass/ass_utils.c \ -SRCS_COMMON-$(LIBAVCODEC) += av_opts.c \ - av_sub.c \ - libaf/af_lavcresample.c \ - libmpcodecs/ad_ffmpeg.c \ - libmpcodecs/vd_ffmpeg.c \ - libmpcodecs/vf_lavc.c \ - libmpcodecs/vf_lavcdeint.c \ - libmpcodecs/vf_screenshot.c \ - -# These filters use private headers and do not work with shared libavcodec. -SRCS_COMMON-$(LIBAVCODEC_A) += libaf/af_lavcac3enc.c \ - libmpcodecs/vf_fspp.c \ - libmpcodecs/vf_geq.c \ - libmpcodecs/vf_mcdeint.c \ - libmpcodecs/vf_qp.c \ - libmpcodecs/vf_spp.c \ - libmpcodecs/vf_uspp.c \ - -SRCS_COMMON-$(LIBAVFORMAT) += libmpdemux/demux_lavf.c \ - stream/stream_ffmpeg.c \ - SRCS_COMMON-$(LIBBLURAY) += stream/stream_bluray.c SRCS_COMMON-$(LIBBS2B) += libaf/af_bs2b.c SRCS_COMMON-$(LIBDCA) += libmpcodecs/ad_libdca.c @@ -181,7 +181,6 @@ SRCS_COMMON-$(LIBNEMESI) += libmpdemux/demux_nemesi.c \ stream/stream_nemesi.c SRCS_COMMON-$(LIBNUT) += libmpdemux/demux_nut.c -SRCS_COMMON-$(LIBPOSTPROC) += libmpcodecs/vf_pp.c SRCS_COMMON-$(LIBSMBCLIENT) += stream/stream_smb.c SRCS_COMMON-$(LIBTHEORA) += libmpcodecs/vd_theora.c SRCS_COMMON-$(LIVE555) += libmpdemux/demux_rtp.cpp \ @@ -547,6 +546,7 @@ SRCS_MPLAYER-$(DXR3) += libvo/vo_dxr3.c SRCS_MPLAYER-$(ESD) += libao2/ao_esd.c SRCS_MPLAYER-$(FBDEV) += libvo/vo_fbdev.c libvo/vo_fbdev2.c +SRCS_MPLAYER-$(FFMPEG) += libvo/vo_png.c SRCS_MPLAYER-$(GGI) += libvo/vo_ggi.c SRCS_MPLAYER-$(GIF) += libvo/vo_gif89a.c SRCS_MPLAYER-$(GL) += libvo/gl_common.c libvo/vo_gl.c \ @@ -597,7 +597,6 @@ SRCS_MPLAYER-$(JPEG) += libvo/vo_jpeg.c SRCS_MPLAYER-$(KAI) += libao2/ao_kai.c SRCS_MPLAYER-$(KVA) += libvo/vo_kva.c -SRCS_MPLAYER-$(LIBAVCODEC) += libvo/vo_png.c SRCS_MPLAYER-$(LIBMENU) += libmenu/menu.c \ libmenu/menu_chapsel.c \ libmenu/menu_cmdlist.c \ @@ -690,8 +689,9 @@ SRCS_MENCODER-$(FAAC) += libmpcodecs/ae_faac.c -SRCS_MENCODER-$(LIBAVCODEC) += libmpcodecs/ae_lavc.c libmpcodecs/ve_lavc.c -SRCS_MENCODER-$(LIBAVFORMAT) += libmpdemux/muxer_lavf.c +SRCS_MENCODER-$(FFMPEG) += libmpcodecs/ae_lavc.c \ + libmpcodecs/ve_lavc.c \ + libmpdemux/muxer_lavf.c SRCS_MENCODER-$(LIBDV) += libmpcodecs/ve_libdv.c SRCS_MENCODER-$(LIBLZO) += libmpcodecs/ve_nuv.c \ libmpcodecs/native/rtjpegn.c @@ -718,12 +718,12 @@ $(SRCS_MENCODER-yes) -COMMON_LIBS-$(LIBAVFORMAT_A) += libavformat/libavformat.a -COMMON_LIBS-$(LIBAVCODEC_A) += libavcodec/libavcodec.a -COMMON_LIBS-$(LIBAVCORE_A) += libavcore/libavcore.a -COMMON_LIBS-$(LIBAVUTIL_A) += libavutil/libavutil.a -COMMON_LIBS-$(LIBPOSTPROC_A) += libpostproc/libpostproc.a -COMMON_LIBS-$(LIBSWSCALE_A) += libswscale/libswscale.a +COMMON_LIBS-$(FFMPEG_A) += libavformat/libavformat.a \ + libavcodec/libavcodec.a \ + libavcore/libavcore.a \ + libavutil/libavutil.a \ + libpostproc/libpostproc.a \ + libswscale/libswscale.a COMMON_LIBS += $(COMMON_LIBS-yes) OBJS_COMMON += $(addsuffix .o, $(basename $(SRCS_COMMON)))