diff options
| author |  wm4 <wm4@nowhere> | 2012-09-07 14:42:25 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-09-18 21:07:30 +0200 |
| commit | ae9c3d530c55e86eb54d8cf23a23c5ce6301ec6e (patch) | |
| tree | 20f50ce7713ffa7d671a86fc43b709354ae8991a /libmpdemux/stheader.h | |
| parent | c323592c3ac8557e09b8235bd43196f968e91168 (diff) | |
libmpdemux: add back demux_ts
Someone wanted this. Apparently both libavformat's TS demuxer and
demux_ts are crap, and work/fail in different cases.
This demuxer has been removed in 1fde09db6f4ce. All code added comes
from the revision before that. Some required bits have been added in
the commit before this one (re-adding demux_mpg), in particular the
changes to video.c.
stream_dvb will use this demuxer by default, otherwise demux_lavf is
preferred (as it has been before).
Some TS related command line options are not re-added.
Closed captions might not work.
Diffstat (limited to 'libmpdemux/stheader.h')
| -rw-r--r-- | libmpdemux/stheader.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libmpdemux/stheader.h b/libmpdemux/stheader.h index f61bf5eb58..f55e8d2722 100644 --- a/libmpdemux/stheader.h +++ b/libmpdemux/stheader.h @@ -179,6 +179,8 @@ struct sh_audio *new_sh_audio_aid(struct demuxer *demuxer, int id, int aid); struct sh_video *new_sh_video_vid(struct demuxer *demuxer, int id, int vid); #define new_sh_sub(d, i) new_sh_sub_sid(d, i, i) struct sh_sub *new_sh_sub_sid(struct demuxer *demuxer, int id, int sid); +struct sh_sub *new_sh_sub_sid_lang(struct demuxer *demuxer, int id, int sid, + const char *lang); void free_sh_audio(struct demuxer *demuxer, int id); void free_sh_video(struct sh_video *sh); |