RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
diego 2006-08-04 21:19:06 +00:00
parent 2205e86985
commit 67c9657f5d
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libmpdemux/demux_mov.c
View File

@ -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);

19
libmpdemux/demux_ogg.c
View File

@ -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