Mercurial > mplayer.hg
comparison libmpdemux/demuxer.c @ 5572:8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
- tvi interface changes, grab_audio/video now returns timestamp!
- tv demuxer gets 'ds' hint too
- some verbose skip/dup counters to mencoder
- tvi_bsdbt848.c updates
- aviwrite/mencoder size types int->off_t
author | arpi |
---|---|
date | Fri, 12 Apr 2002 10:40:38 +0000 |
parents | e80d66b5e4a7 |
children | 6586448b5243 |
comparison
equal
deleted
inserted
replaced
5571:124bfc43c044 | 5572:8cd761968f35 |
---|---|
212 #ifdef USE_TV | 212 #ifdef USE_TV |
213 #include "tv.h" | 213 #include "tv.h" |
214 extern tvi_handle_t *tv_handler; | 214 extern tvi_handle_t *tv_handler; |
215 extern int tv_param_on; | 215 extern int tv_param_on; |
216 | 216 |
217 extern int demux_tv_fill_buffer(demuxer_t *demux, tvi_handle_t *tvh); | 217 extern int demux_tv_fill_buffer(demuxer_t *demux, demux_stream_t *ds, tvi_handle_t *tvh); |
218 extern int demux_open_tv(demuxer_t *demuxer, tvi_handle_t *tvh); | 218 extern int demux_open_tv(demuxer_t *demuxer, tvi_handle_t *tvh); |
219 #endif | 219 #endif |
220 int demux_y4m_fill_buffer(demuxer_t *demux); | 220 int demux_y4m_fill_buffer(demuxer_t *demux); |
221 int demux_audio_fill_buffer(demux_stream_t *ds); | 221 int demux_audio_fill_buffer(demux_stream_t *ds); |
222 extern int demux_demuxers_fill_buffer(demuxer_t *demux,demux_stream_t *ds); | 222 extern int demux_demuxers_fill_buffer(demuxer_t *demux,demux_stream_t *ds); |
240 case DEMUXER_TYPE_MOV: return demux_mov_fill_buffer(demux,ds); | 240 case DEMUXER_TYPE_MOV: return demux_mov_fill_buffer(demux,ds); |
241 case DEMUXER_TYPE_VIVO: return demux_vivo_fill_buffer(demux); | 241 case DEMUXER_TYPE_VIVO: return demux_vivo_fill_buffer(demux); |
242 case DEMUXER_TYPE_REAL: return demux_real_fill_buffer(demux); | 242 case DEMUXER_TYPE_REAL: return demux_real_fill_buffer(demux); |
243 case DEMUXER_TYPE_NUV: return demux_nuv_fill_buffer(demux); | 243 case DEMUXER_TYPE_NUV: return demux_nuv_fill_buffer(demux); |
244 #ifdef USE_TV | 244 #ifdef USE_TV |
245 case DEMUXER_TYPE_TV: return demux_tv_fill_buffer(demux, tv_handler); | 245 case DEMUXER_TYPE_TV: return demux_tv_fill_buffer(demux, ds, tv_handler); |
246 #endif | 246 #endif |
247 case DEMUXER_TYPE_Y4M: return demux_y4m_fill_buffer(demux); | 247 case DEMUXER_TYPE_Y4M: return demux_y4m_fill_buffer(demux); |
248 case DEMUXER_TYPE_AUDIO: return demux_audio_fill_buffer(ds); | 248 case DEMUXER_TYPE_AUDIO: return demux_audio_fill_buffer(ds); |
249 case DEMUXER_TYPE_DEMUXERS: return demux_demuxers_fill_buffer(demux,ds); | 249 case DEMUXER_TYPE_DEMUXERS: return demux_demuxers_fill_buffer(demux,ds); |
250 case DEMUXER_TYPE_OGG: return demux_ogg_fill_buffer(demux); | 250 case DEMUXER_TYPE_OGG: return demux_ogg_fill_buffer(demux); |