configure, build: remove --disable-libav support

Remove support for building the player without libavcodec and
libavformat. These libraries are now always required.

16 files changed, 24 insertions, 97 deletions

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)
diff --git a/av_log.c b/av_log.c
index 7c6307d274..bccbff54de 100644
--- a/av_log.c
+++ b/av_log.c
@@ -29,12 +29,10 @@
 #include <libavutil/avutil.h>
 #include <libavutil/log.h>
 
-#ifdef CONFIG_FFMPEG
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 #include <libswscale/swscale.h>
 #include <libpostproc/postprocess.h>
-#endif
 
 static int av_log_level_to_mp_level(int av_level)
 {
@@ -64,7 +62,6 @@ static int extract_msg_type_from_ctx(void *ptr)
         return MSGT_FIXME;
     }
 
-#ifdef CONFIG_FFMPEG
     if (!strcmp(avc->class_name, "AVCodecContext")) {
         AVCodecContext *s = ptr;
         if (s->codec) {
@@ -89,7 +86,6 @@ static int extract_msg_type_from_ctx(void *ptr)
             return MSGT_MUXER;
         return MSGT_FIXME;
     }
-#endif
 
     return MSGT_FIXME;
 }
@@ -115,12 +111,11 @@ static void mp_msg_av_log_callback(void *ptr, int level, const char *fmt,
 void init_libav(void)
 {
     av_log_set_callback(mp_msg_av_log_callback);
-#ifdef CONFIG_FFMPEG
+
     avcodec_init();
     avcodec_register_all();
 
     av_register_all();
-#endif
 }
 
 #define V(x) (x)>>16, (x)>>8 & 255, (x) & 255
@@ -139,10 +134,8 @@ static void print_version(char *name, unsigned buildv, unsigned runv)
 void print_libav_versions(void)
 {
     print_version("libavutil", LIBAVUTIL_VERSION_INT, avutil_version());
-#ifdef CONFIG_FFMPEG
     print_version("libavcodec", LIBAVCODEC_VERSION_INT, avcodec_version());
     print_version("libavformat", LIBAVFORMAT_VERSION_INT, avformat_version());
     print_version("libswscale", LIBSWSCALE_VERSION_INT, swscale_version());
     print_version("libpostproc", LIBPOSTPROC_VERSION_INT, postproc_version());
-#endif
 }
diff --git a/cfg-mplayer.h b/cfg-mplayer.h
index c8ca92e3a3..f09cd9edd3 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -595,10 +595,8 @@ const m_option_t common_opts[] = {
     {"vc", &video_codec_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
 
     // postprocessing:
-#ifdef CONFIG_FFMPEG
     {"pp", &divx_quality, CONF_TYPE_INT, 0, 0, 0, NULL},
     {"pphelp", &pp_help, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
-#endif
 
     // scaling:
     {"sws", &sws_flags, CONF_TYPE_INT, 0, 0, 2, NULL},
@@ -619,10 +617,8 @@ const m_option_t common_opts[] = {
     OPT_MAKE_FLAGS("slices", vd_use_slices, 0),
     {"field-dominance", &field_dominance, CONF_TYPE_INT, CONF_RANGE, -1, 1, NULL},
 
-#ifdef CONFIG_FFMPEG
     {"lavdopts", (void *) lavc_decode_opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
     {"lavfdopts", (void *) lavfdopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
-#endif
 #ifdef CONFIG_XVID4
     {"xvidopts", (void *)xvid_dec_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
 #endif
diff --git a/configure b/configure
index fb9249d68e..e46650fdb7 100755
--- a/configure
+++ b/configure
@@ -361,7 +361,7 @@ Codecs:
   --disable-real            disable RealPlayer codecs support [enabled]
   --disable-xvid            disable Xvid [autodetect]
   --disable-libnut          disable libnut [autodetect]
-  --disable-libav           disable Libav [autodetect]
+  --enable-libav            skip Libav autodetection [autodetect]
   --disable-libvorbis       disable libvorbis support [autodetect]
   --disable-tremor          disable Tremor [autodetect if no libvorbis]
   --disable-speex           disable Speex support [autodetect]
@@ -1026,7 +1026,6 @@ for ac_option do
   --enable-libnut)      _libnut=yes     ;;
   --disable-libnut)     _libnut=no      ;;
   --enable-libav)       ffmpeg=yes      ;;
-  --disable-libav)      ffmpeg=no       ;;
   --ffmpeg-source-dir=*)
     _ffmpeg_source=$(echo $ac_option | cut -d '=' -f 2 ) ;;
 
@@ -6007,39 +6006,28 @@ echores "$_live"
 all_libav_libs="libavutil libavcodec libavformat libswscale libpostproc"
 echocheck "Libav ($all_libav_libs)"
 if test "$ffmpeg" = auto ; then
-  ffmpeg=no
   if $_pkg_config --exists --print-errors $all_libav_libs ; then
     inc_ffmpeg=$($_pkg_config --cflags $all_libav_libs)
     _ld_tmp=$($_pkg_config --libs $all_libav_libs)
     extra_ldflags="$extra_ldflags $_ld_tmp"
     extra_cflags="$extra_cflags $inc_ffmpeg"
-    ffmpeg=yes
   elif header_check libavutil/avutil.h -lpostproc -lswscale -lavformat -lavcodec -lavutil $_ld_lm ; then
     extra_ldflags="$extra_ldflags -lpostproc -lswscale -lavformat -lavcodec -lavutil"
-    ffmpeg=yes
   else
-    die "Unable to find development files for some of the Libav libraries above. Aborting. If you really mean to compile without Libav support use --disable-libav."
+    die "Unable to find development files for some of the required Libav libraries above. Aborting."
   fi
 fi
 
 ffmpeg_eval_api=no
 def_ffmpeg_eval_api="#undef CONFIG_FFMPEG_EVAL_API"
-if test "$ffmpeg" = yes; then
-  def_ffmpeg='#define CONFIG_FFMPEG 1'
-  codecmodules="ffmpeg $codecmodules"
-  if $_pkg_config --atleast-version=50.33.0 libavutil ; then
-    ffmpeg_eval_api=yes
-    def_ffmpeg_eval_api="#define CONFIG_FFMPEG_EVAL_API 1"
-  fi
-else
-  def_ffmpeg='#undef CONFIG_FFMPEG'
-  nocodecmodules="ffmpeg $nocodecmodules"
+if $_pkg_config --atleast-version=50.33.0 libavutil ; then
+  ffmpeg_eval_api=yes
+  def_ffmpeg_eval_api="#define CONFIG_FFMPEG_EVAL_API 1"
 fi
-echores "$ffmpeg"
 
 def_ffmpeg_internals="#undef CONFIG_FFMPEG_INTERNALS"
 if ! test -z "$_ffmpeg_source" ; then
-  test "$ffmpeg" = yes && def_ffmpeg_internals="#define CONFIG_FFMPEG_INTERNALS 1" && ffmpeg_internals=yes
+  def_ffmpeg_internals="#define CONFIG_FFMPEG_INTERNALS 1" && ffmpeg_internals=yes
 fi
 
 
@@ -6802,7 +6790,6 @@ XVR100 = $_xvr100
 YUV4MPEG = $_yuv4mpeg
 
 # FFmpeg
-FFMPEG     = $ffmpeg
 FFMPEG_EVAL_API = $ffmpeg_eval_api
 FFMPEG_INTERNALS = $ffmpeg_internals
 FFMPEG_SOURCE_PATH = $_ffmpeg_source
@@ -7156,7 +7143,6 @@ $def_yuv4mpeg
 
 
 /* FFmpeg */
-$def_ffmpeg
 $def_ffmpeg_eval_api
 $def_ffmpeg_internals
 
diff --git a/libaf/af.c b/libaf/af.c
index 8b51eaa0d1..80f9871bfb 100644
--- a/libaf/af.c
+++ b/libaf/af.c
@@ -70,10 +70,8 @@ static af_info_t* filter_list[]={
 #endif
    &af_info_volnorm,
    &af_info_extrastereo,
-#ifdef CONFIG_FFMPEG
    &af_info_lavcac3enc,
    &af_info_lavcresample,
-#endif
    &af_info_sweep,
    &af_info_hrtf,
 #ifdef CONFIG_LADSPA
@@ -491,10 +489,8 @@ int af_init(af_stream_t* s)
                &(s->output.rate));
       if (!af) {
         char *resampler = "resample";
-#ifdef CONFIG_FFMPEG
         if ((AF_INIT_TYPE_MASK & s->cfg.force) == AF_INIT_SLOW)
           resampler = "lavcresample";
-#endif
 	if((AF_INIT_TYPE_MASK & s->cfg.force) == AF_INIT_SLOW){
 	  if(!strcmp(s->first->info->name,"format"))
 	    af = af_append(s,s->first,resampler);
@@ -515,12 +511,10 @@ int af_init(af_stream_t* s)
       if ((AF_INIT_TYPE_MASK & s->cfg.force) == AF_INIT_FAST) {
         char args[32];
 	sprintf(args, "%d", s->output.rate);
-#ifdef CONFIG_FFMPEG
 	if (strcmp(resampler, "lavcresample") == 0)
 	  strcat(args, ":1");
 	else
-#endif
-	strcat(args, ":0:0");
+            strcat(args, ":0:0");
 	af->control(af, AF_CONTROL_COMMAND_LINE, args);
       }
       }
diff --git a/libmpcodecs/ad.c b/libmpcodecs/ad.c
index 68d2c44708..0ab5d44971 100644
--- a/libmpcodecs/ad.c
+++ b/libmpcodecs/ad.c
@@ -67,9 +67,7 @@ const ad_functions_t * const mpcodecs_ad_drivers[] =
 #endif
   &mpcodecs_ad_hwac3,
   &mpcodecs_ad_hwmpa,
-#ifdef CONFIG_FFMPEG
   &mpcodecs_ad_ffmpeg,
-#endif
   &mpcodecs_ad_pcm,
   &mpcodecs_ad_dvdpcm,
   &mpcodecs_ad_alaw,
diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c
index 564ad2a911..5a96e07783 100644
--- a/libmpcodecs/vd.c
+++ b/libmpcodecs/vd.c
@@ -64,9 +64,7 @@ extern const vd_functions_t mpcodecs_vd_qtvideo;
 
 const vd_functions_t * const mpcodecs_vd_drivers[] = {
     &mpcodecs_vd_null,
-#ifdef CONFIG_FFMPEG
     &mpcodecs_vd_ffmpeg,
-#endif
 #ifdef CONFIG_OGGTHEORA
     &mpcodecs_vd_theora,
 #endif
diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c
index 8bd8145042..34790e3d62 100644
--- a/libmpcodecs/vf.c
+++ b/libmpcodecs/vf.c
@@ -133,13 +133,13 @@ static const vf_info_t *const filter_list[] = {
     &vf_info_mirror,
     &vf_info_palette,
     &vf_info_pp7,
-#ifdef CONFIG_FFMPEG
+
     &vf_info_pp,
     &vf_info_lavc,
     &vf_info_lavcdeint,
     &vf_info_screenshot,
     &vf_info_uspp,
-#endif
+
     &vf_info_dvbscale,
     &vf_info_cropdetect,
     &vf_info_test,
diff --git a/libmpdemux/demux_rtp.cpp b/libmpdemux/demux_rtp.cpp
index 6799843ee0..7b9ebbe256 100644
--- a/libmpdemux/demux_rtp.cpp
+++ b/libmpdemux/demux_rtp.cpp
@@ -122,9 +122,7 @@ int rtsp_transport_http = 0;
 #endif
 
 extern int rtsp_port;
-#ifdef CONFIG_FFMPEG
 extern AVCodecContext *avcctx;
-#endif
 
 extern "C" demuxer_t* demux_open_rtp(demuxer_t* demuxer) {
   struct MPOpts *opts = demuxer->opts;
@@ -401,9 +399,7 @@ extern "C" void demux_close_rtp(demuxer_t* demuxer) {
   delete rtpState->videoBufferQueue;
   delete[] rtpState->sdpDescription;
   delete rtpState;
-#ifdef CONFIG_FFMPEG
   av_freep(&avcctx);
-#endif
 
   env->reclaim(); delete scheduler;
 }
@@ -560,7 +556,6 @@ static demux_packet_t* getBuffer(demuxer_t* demuxer, demux_stream_t* ds,
   if (dp == NULL) return NULL;
     }
 
-#ifdef CONFIG_FFMPEG
   extern AVCodecParserContext * h264parserctx;
   int consumed, poutbuf_size = 1;
   const uint8_t *poutbuf = NULL;
@@ -568,7 +563,6 @@ static demux_packet_t* getBuffer(demuxer_t* demuxer, demux_stream_t* ds,
 
   do {
     if (!bufferQueue->nextpacket) {
-#endif
   // Schedule the read operation:
   bufferQueue->blockingFlag = 0;
   bufferQueue->readSource()->getNextFrame(&dp->buffer[headersize], MAX_RTP_FRAME_SIZE - headersize,
@@ -595,7 +589,6 @@ static demux_packet_t* getBuffer(demuxer_t* demuxer, demux_stream_t* ds,
   if (headersize == 1) // amr
     dp->buffer[0] =
         ((AMRAudioSource*)bufferQueue->readSource())->lastFrameHeader();
-#ifdef CONFIG_FFMPEG
     } else {
       bufferQueue->dp = dp = bufferQueue->nextpacket;
       bufferQueue->nextpacket = NULL;
@@ -621,7 +614,6 @@ static demux_packet_t* getBuffer(demuxer_t* demuxer, demux_stream_t* ds,
       }
     }
   } while (!poutbuf_size);
-#endif
 
   // Set the "ptsBehind" result parameter:
   if (bufferQueue->prevPacketPTS != 0.0
diff --git a/libmpdemux/demux_rtp_codec.cpp b/libmpdemux/demux_rtp_codec.cpp
index 68b1964c0c..28fb51e96e 100644
--- a/libmpdemux/demux_rtp_codec.cpp
+++ b/libmpdemux/demux_rtp_codec.cpp
@@ -27,10 +27,8 @@ extern "C" {
 #include "libavutil/base64.h"
 }
 
-#ifdef CONFIG_FFMPEG
 AVCodecParserContext * h264parserctx;
 AVCodecContext *avcctx;
-#endif
 
 // Copied from vlc
 static unsigned char* parseH264ConfigStr( char const* configStr,
@@ -134,7 +132,6 @@ void rtpCodecInitialize_video(demuxer_t* demuxer,
     unsigned char* configData
       = parseH264ConfigStr(subsession->fmtp_spropparametersets(), configLen);
     sh_video->bih = bih = insertVideoExtradata(bih, configData, configLen);
-#ifdef CONFIG_FFMPEG
     int fooLen;
     const uint8_t* fooData;
     h264parserctx = av_parser_init(CODEC_ID_H264);
@@ -142,7 +139,6 @@ void rtpCodecInitialize_video(demuxer_t* demuxer,
     // Pass the config to the parser
     h264parserctx->parser->parser_parse(h264parserctx, avcctx,
                   &fooData, &fooLen, configData, configLen);
-#endif
     delete[] configData;
     needVideoFrameRate(demuxer, subsession);
   } else if (strcmp(subsession->codecName(), "H261") == 0) {
diff --git a/libmpdemux/demux_rtp_internal.h b/libmpdemux/demux_rtp_internal.h
index 3c17a1e42f..4671fef2d3 100644
--- a/libmpdemux/demux_rtp_internal.h
+++ b/libmpdemux/demux_rtp_internal.h
@@ -24,9 +24,7 @@
 extern "C" {
 #include "demuxer.h"
 #include "config.h"
-#ifdef CONFIG_FFMPEG
 #include "libavcodec/avcodec.h"
-#endif
 }
 
 #ifndef _LIVEMEDIA_HH
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 77d4f05c0b..8afeedac8c 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -43,12 +43,10 @@
 #include "libaf/af_format.h"
 #include "libmpcodecs/dec_teletext.h"
 
-#ifdef CONFIG_FFMPEG
 #include "libavcodec/avcodec.h"
 #if MP_INPUT_BUFFER_PADDING_SIZE < FF_INPUT_BUFFER_PADDING_SIZE
 #error MP_INPUT_BUFFER_PADDING_SIZE is too small!
 #endif
-#endif
 
 static void clear_parser(sh_common_t *sh);
 
@@ -109,9 +107,7 @@ const demuxer_desc_t *const demuxer_list[] = {
     &demuxer_desc_tv,
 #endif
     &demuxer_desc_mf,
-#ifdef CONFIG_FFMPEG
     &demuxer_desc_lavf_preferred,
-#endif
     &demuxer_desc_avi,
     &demuxer_desc_y4m,
     &demuxer_desc_asf,
@@ -152,9 +148,7 @@ const demuxer_desc_t *const demuxer_list[] = {
 #ifdef CONFIG_LIBNEMESI
     &demuxer_desc_rtp_nemesi,
 #endif
-#ifdef CONFIG_FFMPEG
     &demuxer_desc_lavf,
-#endif
 #ifdef CONFIG_MUSEPACK
     &demuxer_desc_mpc,
 #endif
@@ -380,9 +374,7 @@ static void free_sh_sub(sh_sub_t *sh)
 {
     mp_msg(MSGT_DEMUXER, MSGL_DBG2, "DEMUXER: freeing sh_sub at %p\n", sh);
     free(sh->extradata);
-#ifdef CONFIG_FFMPEG
     clear_parser((sh_common_t *)sh);
-#endif
     talloc_free(sh);
 }
 
@@ -418,9 +410,7 @@ void free_sh_audio(demuxer_t *demuxer, int id)
     mp_msg(MSGT_DEMUXER, MSGL_DBG2, "DEMUXER: freeing sh_audio at %p\n", sh);
     free(sh->wf);
     free(sh->codecdata);
-#ifdef CONFIG_FFMPEG
     clear_parser((sh_common_t *)sh);
-#endif
     talloc_free(sh);
 }
 
@@ -450,9 +440,7 @@ void free_sh_video(sh_video_t *sh)
 {
     mp_msg(MSGT_DEMUXER, MSGL_DBG2, "DEMUXER: freeing sh_video at %p\n", sh);
     free(sh->bih);
-#ifdef CONFIG_FFMPEG
     clear_parser((sh_common_t *)sh);
-#endif
     talloc_free(sh);
 }
 
@@ -508,7 +496,6 @@ void ds_add_packet(demux_stream_t *ds, demux_packet_t *dp)
            ds->demuxer->video->packs);
 }
 
-#ifdef CONFIG_FFMPEG
 static void allocate_parser(AVCodecContext **avctx, AVCodecParserContext **parser, unsigned format)
 {
     enum CodecID codec_id = CODEC_ID_NONE;
@@ -612,7 +599,6 @@ void ds_clear_parser(demux_stream_t *ds)
         return;
     clear_parser(ds->sh);
 }
-#endif
 
 void ds_read_packet(demux_stream_t *ds, stream_t *stream, int len,
                     double pts, off_t pos, int flags)
diff --git a/libvo/video_out.c b/libvo/video_out.c
index 205d618878..48cfb2a609 100644
--- a/libvo/video_out.c
+++ b/libvo/video_out.c
@@ -231,9 +231,7 @@ const struct vo_driver *video_out_drivers[] =
 #ifdef CONFIG_YUV4MPEG
         &video_out_yuv4mpeg,
 #endif
-#ifdef CONFIG_FFMPEG
         &video_out_png,
-#endif
 #ifdef CONFIG_JPEG
         &video_out_jpeg,
 #endif
diff --git a/mplayer.c b/mplayer.c
index 892455c15c..d79d45f057 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -1953,10 +1953,8 @@ void update_subtitles(struct MPContext *mpctx, double refpts,
             spudec_reset(vo_spudec);
             vo_osd_changed(OSDTYPE_SPU);
         }
-#ifdef CONFIG_FFMPEG
         if (is_av_sub(type))
             reset_avsub(sh_sub);
-#endif
         return;
     }
     // find sub
@@ -2042,12 +2040,10 @@ void update_subtitles(struct MPContext *mpctx, double refpts,
             double duration = d_sub->first->duration;
             len = ds_get_packet_sub(d_sub, &packet);
             if (is_av_sub(type)) {
-#ifdef CONFIG_FFMPEG
                 int ret = decode_avsub(sh_sub, packet, len, subpts, duration);
                 if (ret < 0)
                     mp_msg(MSGT_SPUDEC, MSGL_WARN, "lavc failed decoding "
                            "subtitle\n");
-#endif
                 continue;
             }
             if (type == 'm') {
diff --git a/stream/network.c b/stream/network.c
index ce04444144..0961c8d12b 100644
--- a/stream/network.c
+++ b/stream/network.c
@@ -65,7 +65,6 @@ int   network_ipv4_only_proxy = 0;
 
 
 const mime_struct_t mime_type_table[] = {
-#ifdef CONFIG_FFMPEG
 	// Flash Video
 	{ "video/x-flv", DEMUXER_TYPE_LAVF_PREFERRED},
 	// do not force any demuxer in this case!
@@ -73,7 +72,6 @@ const mime_struct_t mime_type_table[] = {
 	// but for mov reference files to work we must also try
 	// the native demuxer if lavf fails.
 	{ "video/quicktime", 0 },
-#endif
 	// MP3 streaming, some MP3 streaming server answer with audio/mpeg
 	{ "audio/mpeg", DEMUXER_TYPE_AUDIO },
 	// MPEG streaming
diff --git a/stream/stream.c b/stream/stream.c
index fc5185827b..99225ca3b4 100644
--- a/stream/stream.c
+++ b/stream/stream.c
@@ -140,9 +140,7 @@ static const stream_info_t* const auto_open_streams[] = {
 #ifdef CONFIG_LIBBLURAY
   &stream_info_bluray,
 #endif
-#ifdef CONFIG_FFMPEG
   &stream_info_ffmpeg,
-#endif
 
   &stream_info_null,
   &stream_info_mf,