[SCM] libav/experimental: indentation fix, patch by Ryan Martell % rdm4 A martellventures P com % Original thread: Date: Oct 27, 2006 6:17 AM Subject: Re: [Ffmpeg-devel] RTP patches & RFC

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:52:39 UTC 2013


The following commit has been merged in the experimental branch:
commit ed78754216ffe657c6f5e4b71aa41afd2e5ec523
Author: Ryan Martell <rdm4 at martellventures.com>
Date:   Fri Oct 27 17:51:20 2006 +0000

    indentation fix, patch by Ryan Martell % rdm4 A martellventures P com %
    Original thread:
    Date: Oct 27, 2006 6:17 AM
    Subject: Re: [Ffmpeg-devel] RTP patches & RFC
    
    Originally committed as revision 6804 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/rtp.c b/libavformat/rtp.c
index c2c880d..4969acb 100644
--- a/libavformat/rtp.c
+++ b/libavformat/rtp.c
@@ -372,17 +372,17 @@ int rtp_parse_packet(RTPDemuxContext *s, AVPacket *pkt,
         if(s->st && s->parse_packet) {
             return s->parse_packet(s, pkt, 0, NULL, 0);
         } else {
-        if (s->read_buf_index >= s->read_buf_size)
-            return -1;
-        ret = mpegts_parse_packet(s->ts, pkt, s->buf + s->read_buf_index,
-                                  s->read_buf_size - s->read_buf_index);
-        if (ret < 0)
-            return -1;
-        s->read_buf_index += ret;
-        if (s->read_buf_index < s->read_buf_size)
-            return 1;
-        else
-            return 0;
+            if (s->read_buf_index >= s->read_buf_size)
+                return -1;
+            ret = mpegts_parse_packet(s->ts, pkt, s->buf + s->read_buf_index,
+                                      s->read_buf_size - s->read_buf_index);
+            if (ret < 0)
+                return -1;
+            s->read_buf_index += ret;
+            if (s->read_buf_index < s->read_buf_size)
+                return 1;
+            else
+                return 0;
         }
     }
 
@@ -460,8 +460,8 @@ int rtp_parse_packet(RTPDemuxContext *s, AVPacket *pkt,
             if(s->parse_packet) {
                 return s->parse_packet(s, pkt, timestamp, buf, len);
             } else {
-            av_new_packet(pkt, len);
-            memcpy(pkt->data, buf, len);
+                av_new_packet(pkt, len);
+                memcpy(pkt->data, buf, len);
             }
             break;
         }
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index c9ba8a0..d340819 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -467,7 +467,7 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1,
                             sdp_parse_fmtp(st, p);
                         }
                     } else {
-                    sdp_parse_fmtp(st, p);
+                        sdp_parse_fmtp(st, p);
                     }
                 }
             }

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list