diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-02 20:55:04 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-02 20:55:04 +0200 |
| commit | d8fad6cc3d21668ca4efbe87515604d9b9115869 (patch) | |
| tree | 52011e0ee90a14749bebc5f7d69f28870d93ddc1 /libmpdemux | |
| parent | 14d31933913dcab7cc2a0c62a25d04237de92004 (diff) | |
| download | mpv-d8fad6cc3d21668ca4efbe87515604d9b9115869.tar.bz2 mpv-d8fad6cc3d21668ca4efbe87515604d9b9115869.tar.xz | |
demux_rtp.cpp: Fix compilation issues
This file hadn't been updated after some API changes.
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_rtp.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmpdemux/demux_rtp.cpp b/libmpdemux/demux_rtp.cpp index 99fdb1c39f..9459cd6379 100644 --- a/libmpdemux/demux_rtp.cpp +++ b/libmpdemux/demux_rtp.cpp @@ -95,7 +95,6 @@ static char* openURL_sip(SIPClient* client, char const* url) { int rtspStreamOverTCP = 0; extern int rtsp_port; -extern "C" int audio_id, video_id, dvdsub_id; extern "C" demuxer_t* demux_open_rtp(demuxer_t* demuxer) { struct MPOpts *opts = demuxer->opts; Boolean success = False; @@ -258,7 +257,8 @@ extern "C" demuxer_t* demux_open_rtp(demuxer_t* demuxer) { if (demux_is_multiplexed_rtp_stream(demuxer)) { stream_t* s = new_ds_stream(demuxer->video); demuxer_t* od = demux_open(opts, s, DEMUXER_TYPE_UNKNOWN, - audio_id, video_id, dvdsub_id, NULL); + opts->audio_id, opts->video_id, opts->sub_id, + NULL); demuxer = new_demuxers_demuxer(od, od, od); } @@ -638,7 +638,7 @@ demux_packet_t* ReadBufferQueue::getPendingBuffer() { return dp; } -static int demux_rtp_control(struct demuxer_st *demuxer, int cmd, void *arg) { +static int demux_rtp_control(struct demuxer *demuxer, int cmd, void *arg) { double endpts = ((RTPState*)demuxer->priv)->mediaSession->playEndTime(); switch(cmd) { |