diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-19 14:23:54 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-19 14:23:54 +0000 |
| commit | b38e1ca6e7f699db28a9f15111a8a82ce600ef97 (patch) | |
| tree | f3fe29fd9aa2614b508bf20f5aa1a17698e71290 /libmpdemux/demux_ogg.c | |
| parent | 0b062aa4474e24fcbf56b5341cded4a622f6e18f (diff) | |
| download | mpv-b38e1ca6e7f699db28a9f15111a8a82ce600ef97.tar.bz2 mpv-b38e1ca6e7f699db28a9f15111a8a82ce600ef97.tar.xz | |
Generalize subtitle switching, demux_ogg does not need a special case
anymore and demux_mov works now, too.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21054 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_ogg.c')
| -rw-r--r-- | libmpdemux/demux_ogg.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index e0cb4ebb0a..b4ab6e777b 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -488,7 +488,7 @@ static void demux_ogg_check_comments(demuxer_t *d, ogg_stream_t *os, int id, vor // check for -slang if subs are uninitialized yet if (os->text && d->sub->id < 0 && demux_ogg_check_lang(val, dvdsub_lang)) { - d->sub->id = id; + d->sub->id = index; dvdsub_id = index; mp_msg(MSGT_DEMUX, MSGL_V, "Ogg demuxer: Displaying subtitle stream id %d which matched -slang %s\n", id, val); } @@ -538,7 +538,7 @@ static int demux_ogg_add_packet(demux_stream_t* ds,ogg_stream_t* os,int id,ogg_p vorbis_info_clear(&vi); } if (os->text) { - if (id == d->sub->id) // don't want to add subtitles to the demuxer for now + if (id == demux_ogg_sub_id(d->sub->id)) // don't want to add subtitles to the demuxer for now demux_ogg_add_sub(os,pack); return 0; } @@ -718,16 +718,6 @@ extern void print_video_header(BITMAPINFOHEADER *h, int verbose_level); /* defined in demux_mov.c */ extern unsigned int store_ughvlc(unsigned char *s, unsigned int v); -/** \brief Return the number of subtitle tracks in the file. - - \param demuxer The demuxer for which the number of subtitle tracks - should be returned. -*/ -int demux_ogg_num_subs(demuxer_t *demuxer) { - ogg_demuxer_t *ogg_d = (ogg_demuxer_t *)demuxer->priv; - return ogg_d->n_text; -} - /** \brief Change the current subtitle stream and return its ID. \param demuxer The demuxer whose subtitle stream will be changed. |