aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Dume2014-09-23 10:29:59 -0400
committerDiego Biurrun2014-09-25 01:58:51 -0700
commit4620affa24eedb167482198aa04126bcedd05620 (patch)
tree3eb92b45dc1fb61a3d4d564f750f275a32981073
parent86a361081d3eb4e999d75bc2a462f01d88cbd2e5 (diff)
m4vdec: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
-rw-r--r--libavformat/m4vdec.c30
1 files changed, 18 insertions, 12 deletions
diff --git a/libavformat/m4vdec.c b/libavformat/m4vdec.c
index 04bd0621bc..4a0af3c037 100644
--- a/libavformat/m4vdec.c
+++ b/libavformat/m4vdec.c
@@ -27,26 +27,32 @@
static int mpeg4video_probe(AVProbeData *probe_packet)
{
- uint32_t temp_buffer= -1;
- int VO=0, VOL=0, VOP = 0, VISO = 0, res=0;
+ uint32_t temp_buffer = -1;
+ int VO = 0, VOL = 0, VOP = 0, VISO = 0, res = 0;
int i;
- for(i=0; i<probe_packet->buf_size; i++){
- temp_buffer = (temp_buffer<<8) + probe_packet->buf[i];
+ for (i = 0; i < probe_packet->buf_size; i++) {
+ temp_buffer = (temp_buffer << 8) + probe_packet->buf[i];
if ((temp_buffer & 0xffffff00) != 0x100)
continue;
- if (temp_buffer == VOP_START_CODE) VOP++;
- else if (temp_buffer == VISUAL_OBJECT_START_CODE) VISO++;
- else if (temp_buffer < 0x120) VO++;
- else if (temp_buffer < 0x130) VOL++;
- else if ( !(0x1AF < temp_buffer && temp_buffer < 0x1B7)
- && !(0x1B9 < temp_buffer && temp_buffer < 0x1C4)) res++;
+ if (temp_buffer == VOP_START_CODE)
+ VOP++;
+ else if (temp_buffer == VISUAL_OBJECT_START_CODE)
+ VISO++;
+ else if (temp_buffer < 0x120)
+ VO++;
+ else if (temp_buffer < 0x130)
+ VOL++;
+ else if (!(0x1AF < temp_buffer && temp_buffer < 0x1B7) &&
+ !(0x1B9 < temp_buffer && temp_buffer < 0x1C4))
+ res++;
}
- if (VOP >= VISO && VOP >= VOL && VO >= VOL && VOL > 0 && res==0)
+ if (VOP >= VISO && VOP >= VOL && VO >= VOL && VOL > 0 && res == 0)
return AVPROBE_SCORE_EXTENSION;
return 0;
}
-FF_DEF_RAWVIDEO_DEMUXER(m4v, "raw MPEG-4 video", mpeg4video_probe, "m4v", AV_CODEC_ID_MPEG4)
+FF_DEF_RAWVIDEO_DEMUXER(m4v, "raw MPEG-4 video", mpeg4video_probe, "m4v",
+ AV_CODEC_ID_MPEG4)