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.
---
 mplayer.c | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'mplayer.c')

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') {
-- 
cgit v1.2.3