Mercurial > mplayer.hg

comparison libmpdemux/demux_ogg.c @ 17012:6ff3379a0862

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Unify include path handling, -I.. is in CFLAGS.
author diego
date Fri, 18 Nov 2005 14:39:25 +0000
parents 6b1d1e4adaea
children 49cc83ac227f
comparison
equal deleted inserted replaced
17011:c29e74822d2c 17012:6ff3379a0862
7 #include <stdio.h> 7 #include <stdio.h>
8 #include <string.h> 8 #include <string.h>
9 #include <assert.h> 9 #include <assert.h>
10 #include <math.h> 10 #include <math.h>
11 11
12 #include "../mp_msg.h" 12 #include "mp_msg.h"
13 #include "../help_mp.h" 13 #include "help_mp.h"
14 #include "stream.h" 14 #include "stream.h"
15 #include "demuxer.h" 15 #include "demuxer.h"
16 #include "stheader.h" 16 #include "stheader.h"
17 17
18 #define FOURCC_VORBIS mmioFOURCC('v', 'r', 'b', 's') 18 #define FOURCC_VORBIS mmioFOURCC('v', 'r', 'b', 's')
159 extern int demux_aid_vid_mismatch; 159 extern int demux_aid_vid_mismatch;
160 160
161 //-------- subtitle support - should be moved to decoder layer, and queue 161 //-------- subtitle support - should be moved to decoder layer, and queue
162 // - subtitles up in demuxer buffer... 162 // - subtitles up in demuxer buffer...
163 163
164 #include "../subreader.h" 164 #include "subreader.h"
165 #include "../libvo/sub.h" 165 #include "libvo/sub.h"
166 #define OGG_SUB_MAX_LINE 128 166 #define OGG_SUB_MAX_LINE 128
167 167
168 static subtitle ogg_sub; 168 static subtitle ogg_sub;
169 extern subtitle* vo_sub; 169 extern subtitle* vo_sub;
170 static float clear_sub; 170 static float clear_sub;