diff options
author | lu_zero <lu_zero@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-10-29 18:31:47 +0000 |
---|---|---|
committer | lu_zero <lu_zero@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-10-29 18:31:47 +0000 |
commit | dcf5dda46958d7f6320b6bbd30f29f198f279ca9 (patch) | |
tree | 5c9cb68b203df52039ed17ef1cc211c54ab95e4c /libmpdemux | |
parent | ec70a0fbbd0d398e1baf9abf194b406a60d5a4b3 (diff) | |
download | mpv-dcf5dda46958d7f6320b6bbd30f29f198f279ca9.tar.bz2 mpv-dcf5dda46958d7f6320b6bbd30f29f198f279ca9.tar.xz |
Update to use newer libnemesi, should fix desync, fps guessing may fail now
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24883 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/demux_nemesi.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/libmpdemux/demux_nemesi.c b/libmpdemux/demux_nemesi.c index ddf176c50b..d1ab2a0995 100644 --- a/libmpdemux/demux_nemesi.c +++ b/libmpdemux/demux_nemesi.c @@ -43,7 +43,7 @@ static void link_session_and_fetch_conf(Nemesi_DemuxerStreamData * ndsd, rtp_buff * buff, unsigned int * fps) { extern float force_fps; - rtp_ssrc *ssrc; + rtp_ssrc *ssrc = NULL; rtsp_ctrl * ctl = ndsd->rtsp; rtp_frame * fr = &ndsd->first_pkt[stype]; rtp_buff trash_buff; @@ -54,15 +54,8 @@ static void link_session_and_fetch_conf(Nemesi_DemuxerStreamData * ndsd, buff = &trash_buff; if ( (buff != NULL) || (fps != NULL) ) { - rtp_fill_buffers(rtsp_get_rtp_th(ctl)); - for (ssrc = rtp_active_ssrc_queue(rtsp_get_rtp_queue(ctl)); - ssrc; - ssrc = rtp_next_active_ssrc(ssrc)) { - if (ssrc->rtp_sess == sess) { - rtp_fill_buffer(ssrc, fr, buff); - break; - } - } + while ( !(ssrc = rtp_session_get_ssrc(sess, ctl)) ); + rtp_fill_buffer(ssrc, fr, buff); if ( (force_fps == 0.0) && (fps != NULL) ) { rtp_fill_buffers(rtsp_get_rtp_th(ctl)); @@ -184,6 +177,7 @@ demuxer_t* demux_open_rtp(demuxer_t* demuxer) demux_stream_t* d_video; int fps = 0; rtp_buff buff; + memset(&buff, 0, sizeof(rtp_buff)); mp_msg(MSGT_DEMUX, MSGL_INFO, "Detected as VIDEO stream...\n"); |