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 /sub/dec_sub.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 'sub/dec_sub.h')
| -rw-r--r-- | sub/dec_sub.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sub/dec_sub.h b/sub/dec_sub.h index 263df19bc0..4eb833c52b 100644 --- a/sub/dec_sub.h +++ b/sub/dec_sub.h @@ -21,9 +21,6 @@ void sub_reset(struct sh_sub *sh, struct osd_state *osd); void sub_switchoff(struct sh_sub *sh, struct osd_state *osd); void sub_uninit(struct sh_sub *sh); -struct sh_sub *sd_ass_create_from_track(struct ass_track *track, - const char *codec, struct MPOpts *opts); - #ifdef CONFIG_ASS struct ass_track *sub_get_ass_track(struct osd_state *osd); #endif |