Browse code

Merge commit '4620affa24eedb167482198aa04126bcedd05620'

* commit '4620affa24eedb167482198aa04126bcedd05620':
m4vdec: K&R formatting cosmetics

Conflicts:
libavformat/m4vdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Michael Niedermayer authored on 2014/09/25 21:02:55
Showing 1 changed files
... ...
@@ -27,28 +27,34 @@
27 27
 
28 28
 static int mpeg4video_probe(AVProbeData *probe_packet)
29 29
 {
30
-    uint32_t temp_buffer= -1;
31
-    int VO=0, VOL=0, VOP = 0, VISO = 0, res=0;
30
+    uint32_t temp_buffer = -1;
31
+    int VO = 0, VOL = 0, VOP = 0, VISO = 0, res = 0;
32 32
     int i;
33 33
 
34
-    for(i=0; i<probe_packet->buf_size; i++){
35
-        temp_buffer = (temp_buffer<<8) + probe_packet->buf[i];
34
+    for (i = 0; i < probe_packet->buf_size; i++) {
35
+        temp_buffer = (temp_buffer << 8) + probe_packet->buf[i];
36 36
         if (temp_buffer & 0xfffffe00)
37 37
             continue;
38 38
         if (temp_buffer < 2)
39 39
             continue;
40 40
 
41
-        if (temp_buffer == VOP_START_CODE)                         VOP++;
42
-        else if (temp_buffer == VISUAL_OBJECT_START_CODE)          VISO++;
43
-        else if (temp_buffer >= 0x100 && temp_buffer < 0x120)      VO++;
44
-        else if (temp_buffer >= 0x120 && temp_buffer < 0x130)      VOL++;
45
-        else if (   !(0x1AF < temp_buffer && temp_buffer < 0x1B7)
46
-                 && !(0x1B9 < temp_buffer && temp_buffer < 0x1C4)) res++;
41
+        if (temp_buffer == VOP_START_CODE)
42
+            VOP++;
43
+        else if (temp_buffer == VISUAL_OBJECT_START_CODE)
44
+            VISO++;
45
+        else if (temp_buffer >= 0x100 && temp_buffer < 0x120)
46
+            VO++;
47
+        else if (temp_buffer >= 0x120 && temp_buffer < 0x130)
48
+            VOL++;
49
+        else if (!(0x1AF < temp_buffer && temp_buffer < 0x1B7) &&
50
+                 !(0x1B9 < temp_buffer && temp_buffer < 0x1C4))
51
+            res++;
47 52
     }
48 53
 
49
-    if (VOP >= VISO && VOP >= VOL && VO >= VOL && VOL > 0 && res==0)
54
+    if (VOP >= VISO && VOP >= VOL && VO >= VOL && VOL > 0 && res == 0)
50 55
         return VOP+VO > 4 ? AVPROBE_SCORE_EXTENSION : AVPROBE_SCORE_EXTENSION/2;
51 56
     return 0;
52 57
 }
53 58
 
54
-FF_DEF_RAWVIDEO_DEMUXER(m4v, "raw MPEG-4 video", mpeg4video_probe, "m4v", AV_CODEC_ID_MPEG4)
59
+FF_DEF_RAWVIDEO_DEMUXER(m4v, "raw MPEG-4 video", mpeg4video_probe, "m4v",
60
+                        AV_CODEC_ID_MPEG4)