diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-04-12 10:40:38 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-04-12 10:40:38 +0000 |
| commit | e40b5a0509ebee9406e4651c99f3c7f89bd89ac8 (patch) | |
| tree | 4bbc67311223c1ba0d746b9cf4a375e119220ad3 /libmpdemux/demuxer.c | |
| parent | 90bfc582ca7c54b57c2c303ec8b43b00dd45d8d9 (diff) | |
| download | mpv-e40b5a0509ebee9406e4651c99f3c7f89bd89ac8.tar.bz2 mpv-e40b5a0509ebee9406e4651c99f3c7f89bd89ac8.tar.xz | |
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
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5573 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demuxer.c')
| -rw-r--r-- | libmpdemux/demuxer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 4585d1f046..18f1739d42 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -214,7 +214,7 @@ int demux_nuv_fill_buffer(demuxer_t *demux); extern tvi_handle_t *tv_handler; extern int tv_param_on; -extern int demux_tv_fill_buffer(demuxer_t *demux, tvi_handle_t *tvh); +extern int demux_tv_fill_buffer(demuxer_t *demux, demux_stream_t *ds, tvi_handle_t *tvh); extern int demux_open_tv(demuxer_t *demuxer, tvi_handle_t *tvh); #endif int demux_y4m_fill_buffer(demuxer_t *demux); @@ -242,7 +242,7 @@ int demux_fill_buffer(demuxer_t *demux,demux_stream_t *ds){ case DEMUXER_TYPE_REAL: return demux_real_fill_buffer(demux); case DEMUXER_TYPE_NUV: return demux_nuv_fill_buffer(demux); #ifdef USE_TV - case DEMUXER_TYPE_TV: return demux_tv_fill_buffer(demux, tv_handler); + case DEMUXER_TYPE_TV: return demux_tv_fill_buffer(demux, ds, tv_handler); #endif case DEMUXER_TYPE_Y4M: return demux_y4m_fill_buffer(demux); case DEMUXER_TYPE_AUDIO: return demux_audio_fill_buffer(ds); |