diff options
author | wm4 <wm4@nowhere> | 2013-06-01 19:43:11 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-06-01 19:43:11 +0200 |
commit | 27d383918a3d63559c85ca96b2162a13234f2abc (patch) | |
tree | daac6d3fbbfece956e72189a032866f093b42764 /demux/stheader.h | |
parent | f7b9b92179333e5bf399cbb6289b66ed3439445c (diff) | |
download | mpv-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 'demux/stheader.h')
-rw-r--r-- | demux/stheader.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/demux/stheader.h b/demux/stheader.h index 433dc7ef71..09e9d8682b 100644 --- a/demux/stheader.h +++ b/demux/stheader.h @@ -164,6 +164,7 @@ typedef struct sh_sub { bool active; // after track switch decoder may stay initialized, not active unsigned char *extradata; // extra header data passed from demuxer int extradata_len; + struct ass_track *track; // loaded by libass const struct sd_functions *sd_driver; } sh_sub_t; |