---
libavformat/aacdec.c | 32 +++++++++++++++++++-------------
1 file changed, 19 insertions(+), 13 deletions(-)
diff --git a/libavformat/aacdec.c b/libavformat/aacdec.c
index 8d87ce6..56f7f06 100644
--- a/libavformat/aacdec.c
+++ b/libavformat/aacdec.c
@@ -38,27 +38,33 @@ static int adts_aac_probe(AVProbeData *p)
buf = buf0;
- for(; buf < end; buf= buf2+1) {
+ for (; buf < end; buf = buf2 + 1) {
buf2 = buf;
- for(frames = 0; buf2 < end; frames++) {
+ for (frames = 0; buf2 < end; frames++) {
uint32_t header = AV_RB16(buf2);
- if((header&0xFFF6) != 0xFFF0)
+ if ((header & 0xFFF6) != 0xFFF0)
break;
fsize = (AV_RB32(buf2 + 3) >> 13) & 0x1FFF;
- if(fsize < 7)
+ if (fsize < 7)
break;
buf2 += fsize;
}
max_frames = FFMAX(max_frames, frames);
- if(buf == buf0)
- first_frames= frames;
+ if (buf == buf0)
+ first_frames = frames;
}
- if (first_frames>=3) return AVPROBE_SCORE_EXTENSION + 1;
- else if(max_frames>500)return AVPROBE_SCORE_EXTENSION;
- else if(max_frames>=3) return AVPROBE_SCORE_EXTENSION / 2;
- else if(max_frames>=1) return 1;
- else return 0;
+
+ if (first_frames >= 3)
+ return AVPROBE_SCORE_EXTENSION + 1;
+ else if (max_frames > 500)
+ return AVPROBE_SCORE_EXTENSION;
+ else if (max_frames >= 3)
+ return AVPROBE_SCORE_EXTENSION / 2;
+ else if (max_frames >= 1)
+ return 1;
+ else
+ return 0;
}
static int adts_aac_read_header(AVFormatContext *s)
@@ -70,8 +76,8 @@ static int adts_aac_read_header(AVFormatContext *s)
return AVERROR(ENOMEM);
st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
- st->codec->codec_id = s->iformat->raw_codec_id;
- st->need_parsing = AVSTREAM_PARSE_FULL;
+ st->codec->codec_id = s->iformat->raw_codec_id;
+ st->need_parsing = AVSTREAM_PARSE_FULL;
ff_id3v1_read(s);
--
1.8.5.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel