summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2011-12-11 07:48:26 +0200
committerUoti Urpala <uau@mplayer2.org>2011-12-11 07:48:26 +0200
commit2e1cdcb9e6263a7ca16151713338176ef7b1ee06 (patch)
treef90c2ac5f9642183106114a81bfb6c979622ea1f /mplayer.c
parentfc2d040b2248adaac816b999a90ad452ee1f2be6 (diff)
downloadmpv-2e1cdcb9e6263a7ca16151713338176ef7b1ee06.tar.bz2
mpv-2e1cdcb9e6263a7ca16151713338176ef7b1ee06.tar.xz
configure, build: remove --disable-libav support
Remove support for building the player without libavcodec and libavformat. These libraries are now always required.
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c4
1 files changed, 0 insertions, 4 deletions
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') {