diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-17 23:25:02 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-17 23:25:02 +0000 |
commit | a37c279d27525ac28936d345f2c216da38e42e90 (patch) | |
tree | 43fa69a7bd71a1d981ed053f60f5a428fae2db2c /libmpdemux | |
parent | 965f604636d3a3ee161dbdc818d6b323893bf2a1 (diff) | |
download | mpv-a37c279d27525ac28936d345f2c216da38e42e90.tar.bz2 mpv-a37c279d27525ac28936d345f2c216da38e42e90.tar.xz |
Move up demux_ogg_sub_id, demux_ogg_sub_reverse_id; avoids forward declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30624 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/demux_ogg.c | 54 |
1 files changed, 25 insertions, 29 deletions
diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index a72600243f..127bde5b48 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -367,7 +367,31 @@ static int demux_ogg_check_lang(const char *clang, const char *langlist) return 0; } -static int demux_ogg_sub_reverse_id(demuxer_t *demuxer, int id); +/** \brief Change the current subtitle stream and return its ID. + + \param demuxer The demuxer whose subtitle stream will be changed. + \param new_num The number of the new subtitle track. The number must be + between 0 and ogg_d->n_text - 1. + + \returns The Ogg stream number ( = page serial number) of the newly selected + track. +*/ +int demux_ogg_sub_id(demuxer_t *demuxer, int index) { + ogg_demuxer_t *ogg_d = demuxer->priv; + return (index < 0) ? index : (index >= ogg_d->n_text) ? -1 : ogg_d->text_ids[index]; +} + +/** \brief Translate the ogg track number into the subtitle number. + * \param demuxer The demuxer about whose subtitles we are inquiring. + * \param id The ogg track number of the subtitle track. + */ +static int demux_ogg_sub_reverse_id(demuxer_t *demuxer, int id) { + ogg_demuxer_t *ogg_d = demuxer->priv; + int i; + for (i = 0; i < ogg_d->n_text; i++) + if (ogg_d->text_ids[i] == id) return i; + return -1; +} /// Try to print out comments and also check for LANGUAGE= tag static void demux_ogg_check_comments(demuxer_t *d, ogg_stream_t *os, int id, vorbis_comment *vc) @@ -641,34 +665,6 @@ static void demux_ogg_scan_stream(demuxer_t *demuxer) void print_wave_header(WAVEFORMATEX *h, int verbose_level); void print_video_header(BITMAPINFOHEADER *h, int verbose_level); -/** \brief Change the current subtitle stream and return its ID. - - \param demuxer The demuxer whose subtitle stream will be changed. - \param new_num The number of the new subtitle track. The number must be - between 0 and ogg_d->n_text - 1. - - \returns The Ogg stream number ( = page serial number) of the newly selected - track. -*/ -int demux_ogg_sub_id(demuxer_t *demuxer, int index) { - ogg_demuxer_t *ogg_d = demuxer->priv; - return (index < 0) ? index : (index >= ogg_d->n_text) ? -1 : ogg_d->text_ids[index]; -} - -/** \brief Translate the ogg track number into the subtitle number. - * \param demuxer The demuxer about whose subtitles we are inquiring. - * \param id The ogg track number of the subtitle track. - */ -static int demux_ogg_sub_reverse_id(demuxer_t *demuxer, int id) { - ogg_demuxer_t *ogg_d = demuxer->priv; - int i; - for (i = 0; i < ogg_d->n_text; i++) - if (ogg_d->text_ids[i] == id) return i; - return -1; -} - -static void demux_close_ogg(demuxer_t* demuxer); - static void fixup_vorbis_wf(sh_audio_t *sh, ogg_demuxer_t *od) { int i, offset; |