[FFmpeg-soc] [soc]: r4768 - in rtmp: rtmppkt.c rtmppkt.h rtmpproto.c

kostya subversion at mplayerhq.hu
Wed Jul 22 09:09:02 CEST 2009


Author: kostya
Date: Wed Jul 22 09:09:02 2009
New Revision: 4768

Log:
cosmetics: reformat long lines

Modified:
   rtmp/rtmppkt.c
   rtmp/rtmppkt.h
   rtmp/rtmpproto.c

Modified: rtmp/rtmppkt.c
==============================================================================
--- rtmp/rtmppkt.c	Wed Jul 22 09:06:25 2009	(r4767)
+++ rtmp/rtmppkt.c	Wed Jul 22 09:09:02 2009	(r4768)
@@ -223,8 +223,8 @@ int ff_amf_skip_data(const uint8_t *data
     }
 }
 
-int ff_amf_find_field(const uint8_t *data, const uint8_t *data_end, const uint8_t *name,
-                      uint8_t *dst, int dst_size)
+int ff_amf_find_field(const uint8_t *data, const uint8_t *data_end,
+                      const uint8_t *name, uint8_t *dst, int dst_size)
 {
     int namelen = strlen(name);
     int len;

Modified: rtmp/rtmppkt.h
==============================================================================
--- rtmp/rtmppkt.h	Wed Jul 22 09:06:25 2009	(r4767)
+++ rtmp/rtmppkt.h	Wed Jul 22 09:09:02 2009	(r4768)
@@ -151,8 +151,8 @@ int ff_amf_skip_data(const uint8_t *data
  * @param dst_size output buffer size
  * @return 0 if search and retrieval succeeded, negative value otherwise
  */
-int ff_amf_find_field(const uint8_t *data, const uint8_t *data_end, const uint8_t *name,
-                      uint8_t *dst, int dst_size);
+int ff_amf_find_field(const uint8_t *data, const uint8_t *data_end,
+                      const uint8_t *name, uint8_t *dst, int dst_size);
 
 /**
  * Write boolean value in AMF format to buffer.

Modified: rtmp/rtmpproto.c
==============================================================================
--- rtmp/rtmpproto.c	Wed Jul 22 09:06:25 2009	(r4767)
+++ rtmp/rtmpproto.c	Wed Jul 22 09:09:02 2009	(r4768)
@@ -402,7 +402,8 @@ static int rtmp_parse_result(URLContext 
         if (!memcmp(pkt->data, "\002\000\006_error", 9)) {
             uint8_t tmpstr[256];
 
-            if (!ff_amf_find_field(pkt->data + 9, pkt->data + pkt->data_size, "description", tmpstr, sizeof(tmpstr)))
+            if (!ff_amf_find_field(pkt->data + 9, pkt->data + pkt->data_size,
+                                   "description", tmpstr, sizeof(tmpstr)))
                 av_log(NULL/*s*/, AV_LOG_ERROR, "Server error: %s\n",tmpstr);
             return -1;
         }
@@ -435,13 +436,16 @@ static int rtmp_parse_result(URLContext 
                     return 1;
                 ptr += t;
             }
-            t = ff_amf_find_field(ptr, pkt->data + pkt->data_size, "level", tmpstr, sizeof(tmpstr));
+            t = ff_amf_find_field(ptr, pkt->data + pkt->data_size,
+                                  "level", tmpstr, sizeof(tmpstr));
             if (!t && !strcmp(tmpstr, "error")) {
-                if (!ff_amf_find_field(ptr, pkt->data + pkt->data_size, "description", tmpstr, sizeof(tmpstr)))
+                if (!ff_amf_find_field(ptr, pkt->data + pkt->data_size,
+                                       "description", tmpstr, sizeof(tmpstr)))
                     av_log(NULL/*s*/, AV_LOG_ERROR, "Server error: %s\n",tmpstr);
                 return -1;
             }
-            t = ff_amf_find_field(ptr, pkt->data + pkt->data_size, "code", tmpstr, sizeof(tmpstr));
+            t = ff_amf_find_field(ptr, pkt->data + pkt->data_size,
+                                  "code", tmpstr, sizeof(tmpstr));
             if (!t && !strcmp(tmpstr, "NetStream.Play.Start")) {
                 rt->state = STATE_PLAYING;
                 return 0;


More information about the FFmpeg-soc mailing list