---
libavformat/m4vdec.c | 31 ++++++++++++++++++-------------
1 file changed, 18 insertions(+), 13 deletions(-)
diff --git a/libavformat/m4vdec.c b/libavformat/m4vdec.c
index 04bd062..b394298 100644
--- a/libavformat/m4vdec.c
+++ b/libavformat/m4vdec.c
@@ -22,29 +22,34 @@
#include "avformat.h"
#include "rawdec.h"
-#define VISUAL_OBJECT_START_CODE 0x000001b5
-#define VOP_START_CODE 0x000001b6
+#define VISUAL_OBJECT_START_CODE 0x000001b5
+#define VOP_START_CODE 0x000001b6
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;
}
--
1.8.5.5
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
