diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-08-04 21:19:06 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-08-04 21:19:06 +0000 |
commit | 67c9657f5d5f066adba9132d7e6155baa3fd4c0e (patch) | |
tree | 87a7f2e3d3db664a2bb096b8c0aaeea0b918e00d | |
parent | 2205e86985e4571d53f60389ffe144fc54af4347 (diff) | |
download | mpv-67c9657f5d5f066adba9132d7e6155baa3fd4c0e.tar.bz2 mpv-67c9657f5d5f066adba9132d7e6155baa3fd4c0e.tar.xz |
Move store_ughvlc to demux_mov as demux_ogg is not always compiled in.
inspired by a patch from Emanuele Giaquinta, emanuele.giaquinta %@% gmail.com
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19332 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | libmpdemux/demux_mov.c | 15 | ||||
-rw-r--r-- | libmpdemux/demux_ogg.c | 19 |
2 files changed, 17 insertions, 17 deletions
diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c index e2da4327b4..f3db4b1883 100644 --- a/libmpdemux/demux_mov.c +++ b/libmpdemux/demux_mov.c @@ -540,10 +540,23 @@ static void demux_close_mov(demuxer_t *demuxer) { free(priv); } +unsigned int store_ughvlc(unsigned char *s, unsigned int v){ + unsigned int n = 0; + + while(v >= 0xff) { + *s++ = 0xff; + v -= 0xff; + n++; + } + *s = v; + n++; + + return n; +} + static int lschunks_intrak(demuxer_t* demuxer, int level, unsigned int id, off_t pos, off_t len, mov_track_t* trak); -extern unsigned int store_ughvlc(unsigned char *s, unsigned int v); static void lschunks(demuxer_t* demuxer,int level,off_t endpos,mov_track_t* trak){ mov_priv_t* priv=demuxer->priv; // printf("lschunks (level=%d,endpos=%x)\n", level, endpos); diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index f521e4ca42..aa0b8bf351 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -1,22 +1,6 @@ #include "config.h" -unsigned int store_ughvlc(unsigned char *s, unsigned int v) -{ - unsigned int n = 0; - - while(v >= 0xff) - { - *s++ = 0xff; - v -= 0xff; - n++; - } - *s = v; - n++; - - return n; -} - #include <stdlib.h> #include <stdio.h> #include <string.h> @@ -730,6 +714,9 @@ void demux_ogg_scan_stream(demuxer_t* demuxer) { extern void print_wave_header(WAVEFORMATEX *h, int verbose_level); 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 |