[FFmpeg-cvslog] r23498 - in trunk/libavformat: rtsp.c rtsp.h

mstorsjo subversion
Sat Jun 5 21:49:55 CEST 2010


Author: mstorsjo
Date: Sat Jun  5 21:49:55 2010
New Revision: 23498

Log:
Cosmetics: Reindent/align/wrap

Modified:
   trunk/libavformat/rtsp.c
   trunk/libavformat/rtsp.h

Modified: trunk/libavformat/rtsp.c
==============================================================================
--- trunk/libavformat/rtsp.c	Sat Jun  5 21:45:46 2010	(r23497)
+++ trunk/libavformat/rtsp.c	Sat Jun  5 21:49:55 2010	(r23498)
@@ -1002,10 +1002,10 @@ int ff_rtsp_read_reply(AVFormatContext *
 }
 
 int ff_rtsp_send_cmd_with_content_async(AVFormatContext *s,
-                                         const char *method, const char *url,
-                                         const char *headers,
-                                         const unsigned char *send_content,
-                                         int send_content_length)
+                                        const char *method, const char *url,
+                                        const char *headers,
+                                        const unsigned char *send_content,
+                                        int send_content_length)
 {
     RTSPState *rt = s->priv_data;
     char buf[4096];
@@ -1041,26 +1041,26 @@ int ff_rtsp_send_cmd_with_content_async(
 }
 
 int ff_rtsp_send_cmd_async(AVFormatContext *s, const char *method,
-                            const char *url, const char *headers)
+                           const char *url, const char *headers)
 {
     return ff_rtsp_send_cmd_with_content_async(s, method, url, headers, NULL, 0);
 }
 
 int ff_rtsp_send_cmd(AVFormatContext *s, const char *method, const char *url,
-                      const char *headers, RTSPMessageHeader *reply,
-                      unsigned char **content_ptr)
+                     const char *headers, RTSPMessageHeader *reply,
+                     unsigned char **content_ptr)
 {
     return ff_rtsp_send_cmd_with_content(s, method, url, headers, reply,
-                                  content_ptr, NULL, 0);
+                                         content_ptr, NULL, 0);
 }
 
 int ff_rtsp_send_cmd_with_content(AVFormatContext *s,
-                                   const char *method, const char *url,
-                                   const char *header,
-                                   RTSPMessageHeader *reply,
-                                   unsigned char **content_ptr,
-                                   const unsigned char *send_content,
-                                   int send_content_length)
+                                  const char *method, const char *url,
+                                  const char *header,
+                                  RTSPMessageHeader *reply,
+                                  unsigned char **content_ptr,
+                                  const unsigned char *send_content,
+                                  int send_content_length)
 {
     RTSPState *rt = s->priv_data;
     HTTPAuthType cur_auth_type;
@@ -1069,7 +1069,8 @@ int ff_rtsp_send_cmd_with_content(AVForm
 retry:
     cur_auth_type = rt->auth_state.auth_type;
     if ((ret = ff_rtsp_send_cmd_with_content_async(s, method, url, header,
-                                        send_content, send_content_length)))
+                                                   send_content,
+                                                   send_content_length)))
         return ret;
 
     if ((ret = ff_rtsp_read_reply(s, reply, content_ptr, 0) ) < 0)

Modified: trunk/libavformat/rtsp.h
==============================================================================
--- trunk/libavformat/rtsp.h	Sat Jun  5 21:45:46 2010	(r23497)
+++ trunk/libavformat/rtsp.h	Sat Jun  5 21:49:55 2010	(r23498)
@@ -349,17 +349,17 @@ extern int rtsp_rtp_port_max;
  * @return zero if success, nonzero otherwise
  */
 int ff_rtsp_send_cmd_with_content_async(AVFormatContext *s,
-                                         const char *method, const char *url,
-                                         const char *headers,
-                                         const unsigned char *send_content,
-                                         int send_content_length);
+                                        const char *method, const char *url,
+                                        const char *headers,
+                                        const unsigned char *send_content,
+                                        int send_content_length);
 /**
  * Send a command to the RTSP server without waiting for the reply.
  *
  * @see rtsp_send_cmd_with_content_async
  */
 int ff_rtsp_send_cmd_async(AVFormatContext *s, const char *method,
-                            const char *url, const char *headers);
+                           const char *url, const char *headers);
 
 /**
  * Send a command to the RTSP server and wait for the reply.
@@ -378,12 +378,12 @@ int ff_rtsp_send_cmd_async(AVFormatConte
  * @return zero if success, nonzero otherwise
  */
 int ff_rtsp_send_cmd_with_content(AVFormatContext *s,
-                                   const char *method, const char *url,
-                                   const char *headers,
-                                   RTSPMessageHeader *reply,
-                                   unsigned char **content_ptr,
-                                   const unsigned char *send_content,
-                                   int send_content_length);
+                                  const char *method, const char *url,
+                                  const char *headers,
+                                  RTSPMessageHeader *reply,
+                                  unsigned char **content_ptr,
+                                  const unsigned char *send_content,
+                                  int send_content_length);
 
 /**
  * Send a command to the RTSP server and wait for the reply.
@@ -391,8 +391,8 @@ int ff_rtsp_send_cmd_with_content(AVForm
  * @see rtsp_send_cmd_with_content
  */
 int ff_rtsp_send_cmd(AVFormatContext *s, const char *method,
-                      const char *url, const char *headers,
-                      RTSPMessageHeader *reply, unsigned char **content_ptr);
+                     const char *url, const char *headers,
+                     RTSPMessageHeader *reply, unsigned char **content_ptr);
 
 /**
  * Read a RTSP message from the server, or prepare to read data



More information about the ffmpeg-cvslog mailing list