From 4bbb3e3a9d2af815986aa38427e5d2a3a34d5e2e Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Thu, 1 Jul 2010 10:59:44 +0000 Subject: Use new librtmp APIs instead of grubbing around in RTMP struct Originally committed as revision 23928 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/librtmp.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'libavformat') diff --git a/libavformat/librtmp.c b/libavformat/librtmp.c index be890ed210..344f0f9088 100644 --- a/libavformat/librtmp.c +++ b/libavformat/librtmp.c @@ -94,7 +94,7 @@ static int rtmp_open(URLContext *s, const char *uri, int flags) } if (flags & URL_WRONLY) - r->Link.protocol |= RTMP_FEATURE_WRITE; + RTMP_EnableWrite(r); if (!RTMP_Connect(r, NULL) || !RTMP_ConnectStream(r, 0)) { rc = -1; @@ -127,10 +127,7 @@ static int rtmp_read_pause(URLContext *s, int pause) { RTMP *r = s->priv_data; - if (pause) - r->m_pauseStamp = - r->m_channelTimestamp[r->m_mediaChannel]; - if (!RTMP_SendPause(r, pause, r->m_pauseStamp)) + if (!RTMP_Pause(r, pause)) return -1; return 0; } @@ -157,7 +154,7 @@ static int rtmp_get_file_handle(URLContext *s) { RTMP *r = s->priv_data; - return r->m_sb.sb_socket; + return RTMP_Socket(r); } URLProtocol rtmp_protocol = { -- cgit v1.2.1