diff options
Diffstat (limited to 'libmpdemux/demux_rtp.cpp')
| -rw-r--r-- | libmpdemux/demux_rtp.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libmpdemux/demux_rtp.cpp b/libmpdemux/demux_rtp.cpp index 43d38806f0..8a5cfb8460 100644 --- a/libmpdemux/demux_rtp.cpp +++ b/libmpdemux/demux_rtp.cpp @@ -26,6 +26,7 @@ extern "C" { #endif #include "demux_rtp.h" #include "stheader.h" +#include "options.h" } #include "demux_rtp_internal.h" @@ -121,8 +122,8 @@ extern int rtsp_port; extern AVCodecContext *avcctx; #endif -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; do { TaskScheduler* scheduler = BasicTaskScheduler::createNew(); @@ -282,8 +283,9 @@ extern "C" demuxer_t* demux_open_rtp(demuxer_t* demuxer) { // code to recognize this: if (demux_is_multiplexed_rtp_stream(demuxer)) { stream_t* s = new_ds_stream(demuxer->video); - demuxer_t* od = demux_open(s, DEMUXER_TYPE_UNKNOWN, - audio_id, video_id, dvdsub_id, NULL); + demuxer_t* od = demux_open(opts, s, DEMUXER_TYPE_UNKNOWN, + opts->audio_id, opts->video_id, opts->sub_id, + NULL); demuxer = new_demuxers_demuxer(od, od, od); } @@ -666,7 +668,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) { |