Merge commit 'f8d10511'

* commit 'f8d10511':
  cosmetics: msnwc_tcp: Reformat
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

libavformat/msnwc_tcp.c

@@ -40,25 +40,26 @@ static int msnwc_tcp_probe(AVProbeData *p)
 {
     int i;
 
-    for(i = 0 ; i + HEADER_SIZE <= p->buf_size ; i++) {
+    for (i = 0; i + HEADER_SIZE <= p->buf_size; i++) {
         uint16_t width, height;
         uint32_t fourcc;
-        const uint8_t *bytestream = p->buf+i;
+        const uint8_t *bytestream = p->buf + i;
 
-        if(bytestream_get_le16(&bytestream) != HEADER_SIZE)
+        if (bytestream_get_le16(&bytestream) != HEADER_SIZE)
             continue;
         width  = bytestream_get_le16(&bytestream);
         height = bytestream_get_le16(&bytestream);
-        if(!(width==320 && height==240) && !(width==160 && height==120))
+        if (!(width == 320 &&
+              height == 240) && !(width == 160 && height == 120))
             continue;
         bytestream += 2; // keyframe
         bytestream += 4; // size
         fourcc      = bytestream_get_le32(&bytestream);
-        if(fourcc != MKTAG('M', 'L', '2', '0'))
+        if (fourcc != MKTAG('M', 'L', '2', '0'))
             continue;
 
-        if(i) {
-            if(i < 14)  /* starts with SwitchBoard connection info */
+        if (i) {
+            if (i < 14) /* starts with SwitchBoard connection info */
                 return AVPROBE_SCORE_MAX / 2;
             else        /* starts in the middle of stream */
                 return AVPROBE_SCORE_MAX / 3;
@@ -77,7 +78,7 @@ static int msnwc_tcp_read_header(AVFormatContext *ctx)
     AVStream *st;
 
     st = avformat_new_stream(ctx, NULL);
-    if(!st)
+    if (!st)
         return AVERROR(ENOMEM);
 
     codec             = st->codec;
@@ -89,7 +90,7 @@ static int msnwc_tcp_read_header(AVFormatContext *ctx)
 
     /* Some files start with "connected\r\n\r\n".
      * So skip until we find the first byte of struct size */
-    while(avio_r8(pb) != HEADER_SIZE && !avio_feof(pb));
+    while(avio_r8(pb) != HEADER_SIZE && !avio_feof(pb)) ;
 
     if(avio_feof(pb)) {
         av_log(ctx, AV_LOG_ERROR, "Could not find valid start.\n");
@@ -129,7 +130,7 @@ static int msnwc_tcp_read_packet(AVFormatContext *ctx, AVPacket *pkt)
 
     /* Some aMsn generated videos (or was it Mercury Messenger?) don't set
      * this bit and rely on the codec to get keyframe information */
-    if(keyframe&1)
+    if (keyframe & 1)
         pkt->flags |= AV_PKT_FLAG_KEY;
 
     return HEADER_SIZE + size;