[FFmpeg-cvslog] r15298 - trunk/libavformat/rtsp.c

rbultje subversion
Thu Sep 11 19:43:44 CEST 2008


Author: rbultje
Date: Thu Sep 11 19:43:44 2008
New Revision: 15298

Log:
Reindent after r15927, see discussion in "[PATCH] rtsp cleanup part 1:
remove duplicate code" thread on ML.



Modified:
   trunk/libavformat/rtsp.c

Modified: trunk/libavformat/rtsp.c
==============================================================================
--- trunk/libavformat/rtsp.c	(original)
+++ trunk/libavformat/rtsp.c	Thu Sep 11 19:43:44 2008
@@ -873,21 +873,21 @@ rtsp_open_transport_ctx(AVFormatContext 
 {
     AVStream *st = NULL;
 
-        /* open the RTP context */
-        if (rtsp_st->stream_index >= 0)
-            st = s->streams[rtsp_st->stream_index];
-        if (!st)
-            s->ctx_flags |= AVFMTCTX_NOHEADER;
-        rtsp_st->rtp_ctx = rtp_parse_open(s, st, rtsp_st->rtp_handle, rtsp_st->sdp_payload_type, &rtsp_st->rtp_payload_data);
+    /* open the RTP context */
+    if (rtsp_st->stream_index >= 0)
+        st = s->streams[rtsp_st->stream_index];
+    if (!st)
+        s->ctx_flags |= AVFMTCTX_NOHEADER;
+    rtsp_st->rtp_ctx = rtp_parse_open(s, st, rtsp_st->rtp_handle, rtsp_st->sdp_payload_type, &rtsp_st->rtp_payload_data);
 
-        if (!rtsp_st->rtp_ctx) {
-            return AVERROR(ENOMEM);
-        } else {
-            if(rtsp_st->dynamic_handler) {
-                rtsp_st->rtp_ctx->dynamic_protocol_context= rtsp_st->dynamic_protocol_context;
-                rtsp_st->rtp_ctx->parse_packet= rtsp_st->dynamic_handler->parse_packet;
-            }
+    if (!rtsp_st->rtp_ctx) {
+         return AVERROR(ENOMEM);
+    } else {
+        if(rtsp_st->dynamic_handler) {
+            rtsp_st->rtp_ctx->dynamic_protocol_context= rtsp_st->dynamic_protocol_context;
+            rtsp_st->rtp_ctx->parse_packet= rtsp_st->dynamic_handler->parse_packet;
         }
+    }
 
     return 0;
 }




More information about the ffmpeg-cvslog mailing list