[SCM] libav/experimental: Move is_input flag into RTMP protocol context. Patch by Sergiy (gmail(piratfm)) Thread "[PATCH] rtmp-output"

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:55:21 UTC 2013


The following commit has been merged in the experimental branch:
commit b316991bb6893f2ee8fc44e5abcaffe6bb3edbaf
Author: Sergiy <piratfm at gmail.com>
Date:   Wed Dec 2 12:55:10 2009 +0000

    Move is_input flag into RTMP protocol context.
    Patch by Sergiy (gmail(piratfm))
    Thread "[PATCH] rtmp-output"
    
    Originally committed as revision 20702 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index 8148fbf..bdaa30f 100644
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@ -57,6 +57,7 @@ typedef struct RTMPContext {
     URLContext*   stream;                     ///< TCP stream used in interactions with RTMP server
     RTMPPacket    prev_pkt[2][RTMP_CHANNELS]; ///< packet history used when reading and sending packets
     int           chunk_size;                 ///< size of the chunks RTMP packets are divided into
+    int           is_input;                   ///< input/output flag
     char          playpath[256];              ///< path to filename to play (with possible "mp4:" prefix)
     ClientState   state;                      ///< current state
     int           main_channel_id;            ///< an additional channel ID which is used for some invocations
@@ -564,15 +565,14 @@ static int rtmp_open(URLContext *s, const char *uri, int flags)
     RTMPContext *rt;
     char proto[8], hostname[256], path[1024], app[128], *fname;
     uint8_t buf[2048];
-    int port, is_input;
+    int port;
     int ret;
 
-    is_input = !(flags & URL_WRONLY);
-
     rt = av_mallocz(sizeof(RTMPContext));
     if (!rt)
         return AVERROR(ENOMEM);
     s->priv_data = rt;
+    rt->is_input = !(flags & URL_WRONLY);
 
     url_split(proto, sizeof(proto), NULL, 0, hostname, sizeof(hostname), &port,
               path, sizeof(path), s->filename);
@@ -586,7 +586,7 @@ static int rtmp_open(URLContext *s, const char *uri, int flags)
         goto fail;
     }
 
-    if (!is_input) {
+    if (!rt->is_input) {
         av_log(LOG_CONTEXT, AV_LOG_ERROR, "RTMP output is not supported yet.\n");
         goto fail;
     } else {

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list