[FFmpeg-cvslog] r23928 - trunk/libavformat/librtmp.c

hyc subversion
Thu Jul 1 12:59:44 CEST 2010


Author: hyc
Date: Thu Jul  1 12:59:44 2010
New Revision: 23928

Log:
Use new librtmp APIs instead of grubbing around in RTMP struct

Modified:
   trunk/libavformat/librtmp.c

Modified: trunk/libavformat/librtmp.c
==============================================================================
--- trunk/libavformat/librtmp.c	Thu Jul  1 12:29:47 2010	(r23927)
+++ trunk/libavformat/librtmp.c	Thu Jul  1 12:59:44 2010	(r23928)
@@ -94,7 +94,7 @@ static int rtmp_open(URLContext *s, cons
     }
 
     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
 {
     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(URLConte
 {
     RTMP *r = s->priv_data;
 
-    return r->m_sb.sb_socket;
+    return RTMP_Socket(r);
 }
 
 URLProtocol rtmp_protocol = {



More information about the ffmpeg-cvslog mailing list