Mercurial > mplayer.hg
comparison libmpdemux/demuxer.h @ 33487:45e772bf4d6a
Fix typos.
Patch by Mike Castle, dalgoda+mplayer gmail
author | cehoyos |
---|---|
date | Fri, 10 Jun 2011 08:31:00 +0000 |
parents | a8619bfabf84 |
children | 18dfcac48055 |
comparison
equal
deleted
inserted
replaced
33486:e46989c7f47e | 33487:45e772bf4d6a |
---|---|
85 #define DEMUXER_TYPE_NUT 43 | 85 #define DEMUXER_TYPE_NUT 43 |
86 #define DEMUXER_TYPE_LAVF_PREFERRED 44 | 86 #define DEMUXER_TYPE_LAVF_PREFERRED 44 |
87 #define DEMUXER_TYPE_RTP_NEMESI 45 | 87 #define DEMUXER_TYPE_RTP_NEMESI 45 |
88 #define DEMUXER_TYPE_MNG 46 | 88 #define DEMUXER_TYPE_MNG 46 |
89 | 89 |
90 // This should always match the higest demuxer type number. | 90 // This should always match the highest demuxer type number. |
91 // Unless you want to disallow users to force the demuxer to some types | 91 // Unless you want to disallow users to force the demuxer to some types |
92 #define DEMUXER_TYPE_MIN 0 | 92 #define DEMUXER_TYPE_MIN 0 |
93 #define DEMUXER_TYPE_MAX 46 | 93 #define DEMUXER_TYPE_MAX 46 |
94 | 94 |
95 #define DEMUXER_TYPE_DEMUXERS (1<<16) | 95 #define DEMUXER_TYPE_DEMUXERS (1<<16) |
257 demux_stream_t *video; // video buffer/demuxer | 257 demux_stream_t *video; // video buffer/demuxer |
258 demux_stream_t *sub; // dvd subtitle buffer/demuxer | 258 demux_stream_t *sub; // dvd subtitle buffer/demuxer |
259 | 259 |
260 // stream headers: | 260 // stream headers: |
261 void* a_streams[MAX_A_STREAMS]; // audio streams (sh_audio_t) | 261 void* a_streams[MAX_A_STREAMS]; // audio streams (sh_audio_t) |
262 void* v_streams[MAX_V_STREAMS]; // video sterams (sh_video_t) | 262 void* v_streams[MAX_V_STREAMS]; // video streams (sh_video_t) |
263 void *s_streams[MAX_S_STREAMS]; // dvd subtitles (flag) | 263 void *s_streams[MAX_S_STREAMS]; // dvd subtitles (flag) |
264 | 264 |
265 // pointer to teletext decoder private data, if demuxer stream contains teletext | 265 // pointer to teletext decoder private data, if demuxer stream contains teletext |
266 void *teletext; | 266 void *teletext; |
267 | 267 |
408 double *pts, double *endpts); | 408 double *pts, double *endpts); |
409 double ds_get_next_pts(demux_stream_t *ds); | 409 double ds_get_next_pts(demux_stream_t *ds); |
410 int ds_parse(demux_stream_t *sh, uint8_t **buffer, int *len, double pts, off_t pos); | 410 int ds_parse(demux_stream_t *sh, uint8_t **buffer, int *len, double pts, off_t pos); |
411 void ds_clear_parser(demux_stream_t *sh); | 411 void ds_clear_parser(demux_stream_t *sh); |
412 | 412 |
413 // This is defined here because demux_stream_t ins't defined in stream.h | 413 // This is defined here because demux_stream_t isn't defined in stream.h |
414 stream_t* new_ds_stream(demux_stream_t *ds); | 414 stream_t* new_ds_stream(demux_stream_t *ds); |
415 | 415 |
416 static inline int avi_stream_id(unsigned int id){ | 416 static inline int avi_stream_id(unsigned int id){ |
417 unsigned char a,b; | 417 unsigned char a,b; |
418 a = id - '0'; | 418 a = id - '0'; |
425 void demux_flush(demuxer_t *demuxer); | 425 void demux_flush(demuxer_t *demuxer); |
426 int demux_seek(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags); | 426 int demux_seek(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags); |
427 demuxer_t* new_demuxers_demuxer(demuxer_t* vd, demuxer_t* ad, demuxer_t* sd); | 427 demuxer_t* new_demuxers_demuxer(demuxer_t* vd, demuxer_t* ad, demuxer_t* sd); |
428 | 428 |
429 // AVI demuxer params: | 429 // AVI demuxer params: |
430 extern int index_mode; // -1=untouched 0=don't use index 1=use (geneate) index | 430 extern int index_mode; // -1=untouched 0=don't use index 1=use (generate) index |
431 extern char *index_file_save, *index_file_load; | 431 extern char *index_file_save, *index_file_load; |
432 extern int force_ni; | 432 extern int force_ni; |
433 extern int pts_from_bps; | 433 extern int pts_from_bps; |
434 | 434 |
435 extern int extension_parsing; | 435 extern int extension_parsing; |