[FFmpeg-cvslog] avformat/cafdec: improve probing

Paul B Mahol git at videolan.org
Thu Sep 21 23:41:54 EEST 2023


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Thu Sep 21 22:18:12 2023 +0200| [365529178dfd23ed79acf780effbaa8ed2a263f9] | committer: Paul B Mahol

avformat/cafdec: improve probing

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=365529178dfd23ed79acf780effbaa8ed2a263f9
---

 libavformat/cafdec.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c
index e0a9031cb8..f5ba0f4108 100644
--- a/libavformat/cafdec.c
+++ b/libavformat/cafdec.c
@@ -52,9 +52,15 @@ typedef struct CafContext {
 
 static int probe(const AVProbeData *p)
 {
-    if (AV_RB32(p->buf) == MKBETAG('c','a','f','f') && AV_RB16(&p->buf[4]) == 1)
-        return AVPROBE_SCORE_MAX;
-    return 0;
+    if (AV_RB32(p->buf) != MKBETAG('c','a','f','f'))
+        return 0;
+    if (AV_RB16(&p->buf[4]) != 1)
+        return 0;
+    if (AV_RB32(p->buf + 8) != MKBETAG('d','e','s','c'))
+        return 0;
+    if (AV_RB64(p->buf + 12) != 32)
+        return 0;
+    return AVPROBE_SCORE_MAX;
 }
 
 /** Read audio description chunk */



More information about the ffmpeg-cvslog mailing list