From 2e1cdcb9e6263a7ca16151713338176ef7b1ee06 Mon Sep 17 00:00:00 2001
From: Uoti Urpala <uau@mplayer2.org>
Date: Sun, 11 Dec 2011 07:48:26 +0200
Subject: configure, build: remove --disable-libav support

Remove support for building the player without libavcodec and
libavformat. These libraries are now always required.
---
 Makefile | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 9ccc15946a..8cb43cb50a 100644
--- a/Makefile
+++ b/Makefile
@@ -59,19 +59,6 @@ SRCS_COMMON-$(DVDREAD_INTERNAL)      += libdvdread4/bitreader.c \
 
 SRCS_COMMON-$(FAAD)                  += libmpcodecs/ad_faad.c
 SRCS_COMMON-$(FASTMEMCPY)            += libvo/aclib.c
-SRCS_COMMON-$(FFMPEG)                += libmpcodecs/vf_pp.c \
-                                        av_opts.c \
-                                        libaf/af_lavcac3enc.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 \
-                                        libmpcodecs/vf_uspp.c \
-                                        libmpdemux/demux_lavf.c \
-                                        stream/stream_ffmpeg.c \
-                                        sub/av_sub.c \
 
 # Requires a new enough libavutil that installs eval.h
 SRCS_COMMON-$(FFMPEG_EVAL_API)          += libmpcodecs/vf_geq.c \
@@ -231,6 +218,7 @@ SRCS_COMMON-$(XMMS_PLUGINS)          += libmpdemux/demux_xmms.c
 SRCS_COMMON-$(XVID4)                 += libmpcodecs/vd_xvid4.c
 SRCS_COMMON = asxparser.c \
               av_log.c \
+              av_opts.c \
               bstr.c \
               codec-cfg.c \
               cpudetect.c \
@@ -260,6 +248,8 @@ SRCS_COMMON = asxparser.c \
               libaf/af_gate.c \
               libaf/af_hrtf.c \
               libaf/af_karaoke.c \
+              libaf/af_lavcac3enc.c \
+              libaf/af_lavcresample.c \
               libaf/af_pan.c \
               libaf/af_resample.c \
               libaf/af_scaletempo.c \
@@ -279,6 +269,7 @@ SRCS_COMMON = asxparser.c \
               libmpcodecs/ad_alaw.c \
               libmpcodecs/ad_dk3adpcm.c \
               libmpcodecs/ad_dvdpcm.c \
+              libmpcodecs/ad_ffmpeg.c \
               libmpcodecs/ad_hwac3.c \
               libmpcodecs/ad_hwmpa.c \
               libmpcodecs/ad_imaadpcm.c \
@@ -291,6 +282,7 @@ SRCS_COMMON = asxparser.c \
               libmpcodecs/mp_image.c \
               libmpcodecs/pullup.c \
               libmpcodecs/vd.c \
+              libmpcodecs/vd_ffmpeg.c \
               libmpcodecs/vd_hmblck.c \
               libmpcodecs/vd_lzo.c \
               libmpcodecs/vd_mpegpes.c \
@@ -333,6 +325,8 @@ SRCS_COMMON = asxparser.c \
               libmpcodecs/vf_ilpack.c \
               libmpcodecs/vf_ivtc.c \
               libmpcodecs/vf_kerndeint.c \
+              libmpcodecs/vf_lavc.c \
+              libmpcodecs/vf_lavcdeint.c \
               libmpcodecs/vf_mirror.c \
               libmpcodecs/vf_noformat.c \
               libmpcodecs/vf_noise.c \
@@ -340,6 +334,7 @@ SRCS_COMMON = asxparser.c \
               libmpcodecs/vf_palette.c \
               libmpcodecs/vf_perspective.c \
               libmpcodecs/vf_phase.c \
+              libmpcodecs/vf_pp.c \
               libmpcodecs/vf_pp7.c \
               libmpcodecs/vf_pullup.c \
               libmpcodecs/vf_rectangle.c \
@@ -348,6 +343,7 @@ SRCS_COMMON = asxparser.c \
               libmpcodecs/vf_rotate.c \
               libmpcodecs/vf_sab.c \
               libmpcodecs/vf_scale.c \
+              libmpcodecs/vf_screenshot.c \
               libmpcodecs/vf_smartblur.c \
               libmpcodecs/vf_softpulldown.c \
               libmpcodecs/vf_stereo3d.c \
@@ -359,6 +355,7 @@ SRCS_COMMON = asxparser.c \
               libmpcodecs/vf_tile.c \
               libmpcodecs/vf_tinterlace.c \
               libmpcodecs/vf_unsharp.c \
+              libmpcodecs/vf_uspp.c \
               libmpcodecs/vf_vo.c \
               libmpcodecs/vf_yadif.c \
               libmpcodecs/vf_yuvcsp.c \
@@ -376,6 +373,7 @@ SRCS_COMMON = asxparser.c \
               libmpdemux/demux_edl.c \
               libmpdemux/demux_film.c \
               libmpdemux/demux_fli.c \
+              libmpdemux/demux_lavf.c \
               libmpdemux/demux_lmlm4.c \
               libmpdemux/demux_mf.c \
               libmpdemux/demux_mkv.c \
@@ -413,10 +411,12 @@ SRCS_COMMON = asxparser.c \
               stream/open.c \
               stream/stream.c \
               stream/stream_cue.c \
+              stream/stream_ffmpeg.c \
               stream/stream_file.c \
               stream/stream_mf.c \
               stream/stream_null.c \
               stream/url.c \
+              sub/av_sub.c \
               sub/sub.c \
               sub/sub_cc.c \
               sub/dec_sub.c \
@@ -451,7 +451,6 @@ SRCS_MPLAYER-$(DIRECTX)      += libao2/ao_dsound.c libvo/vo_directx.c
 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 \
@@ -519,6 +518,7 @@ SRCS_MPLAYER = command.c \
                libvo/video_out.c \
                libvo/vo_mpegpes.c \
                libvo/vo_null.c \
+               libvo/vo_png.c \
                $(SRCS_MPLAYER-yes)
 
 COMMON_LIBS += $(COMMON_LIBS-yes)
-- 
cgit v1.2.3