summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-06-01 19:43:11 +0200
committerwm4 <wm4@nowhere>2013-06-01 19:43:11 +0200
commit27d383918a3d63559c85ca96b2162a13234f2abc (patch)
treedaac6d3fbbfece956e72189a032866f093b42764 /Makefile
parentf7b9b92179333e5bf399cbb6289b66ed3439445c (diff)
downloadmpv-27d383918a3d63559c85ca96b2162a13234f2abc.tar.bz2
mpv-27d383918a3d63559c85ca96b2162a13234f2abc.tar.xz
core: add demux_sub pseudo demuxer
Subtitle files are opened in mplayer.c, not using the demuxer infrastructure in general. Pretend that this is not the case (outside of the loading code) by opening a pseudo demuxer that does nothing. One advantage is that the initialization code is now the same, and there's no confusion about what the difference between track->stream, track->sh_sub and mpctx->sh_sub is supposed to be. This is a bit stupid, and it would be much better if there were proper subtitle demuxers (there are many in recent FFmpeg, but not Libav). So for now this is just a transition to a more proper architecture. Look at demux_sub like an artifical limb: it's ugly, but don't hate it - it helps you to get on with your life.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index e91564703e..6e52253543 100644
--- a/Makefile
+++ b/Makefile
@@ -205,6 +205,7 @@ SOURCES = talloc.c \
demux/demux_mf.c \
demux/demux_mkv.c \
demux/demux_mpg.c \
+ demux/demux_sub.c \
demux/demux_ts.c \
demux/mp3_hdr.c \
demux/parse_es.c \