[SCM] libav/experimental: Reindent/rewrap

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit c690fa97e5d1c431be01bff7eaee3e52319d2050
Author: Martin Storsjö <martin at martin.st>
Date:   Fri Oct 1 17:44:53 2010 +0000

    Reindent/rewrap
    
    Originally committed as revision 25291 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 505a11e..92aa352 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -1261,8 +1261,7 @@ static int rtsp_read_play(AVFormatContext *s)
         if (reply->status_code != RTSP_STATUS_OK) {
             return -1;
         }
-        if (
-            rt->transport == RTSP_TRANSPORT_RTP) {
+        if (rt->transport == RTSP_TRANSPORT_RTP) {
             for (i = 0; i < rt->nb_rtsp_streams; i++) {
                 RTSPStream *rtsp_st = rt->rtsp_streams[i];
                 RTPDemuxContext *rtpctx = rtsp_st->transport_priv;
@@ -1272,12 +1271,12 @@ static int rtsp_read_play(AVFormatContext *s)
                 if (rtsp_st->stream_index >= 0)
                     st = s->streams[rtsp_st->stream_index];
                 if (reply->range_start != AV_NOPTS_VALUE) {
-                rtpctx->last_rtcp_ntp_time  = AV_NOPTS_VALUE;
-                rtpctx->first_rtcp_ntp_time = AV_NOPTS_VALUE;
-                if (st)
-                    rtpctx->range_start_offset = av_rescale_q(reply->range_start,
-                                                              AV_TIME_BASE_Q,
-                                                              st->time_base);
+                    rtpctx->last_rtcp_ntp_time  = AV_NOPTS_VALUE;
+                    rtpctx->first_rtcp_ntp_time = AV_NOPTS_VALUE;
+                    if (st)
+                        rtpctx->range_start_offset =
+                            av_rescale_q(reply->range_start, AV_TIME_BASE_Q,
+                                         st->time_base);
                 }
             }
         }

-- 
Libav/FFmpeg packaging