[FFmpeg-cvslog] lavf/ingenientdec: Add a probe function.

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sat Oct 24 13:28:32 2015 +0200| [a3bed3f3e1a0d76557217ed9ad4a9b20c89ddbcb] | committer: Carl Eugen Hoyos

lavf/ingenientdec: Add a probe function.

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

 libavformat/ingenientdec.c |   13 ++++++++++++-
 libavformat/version.h      |    2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/libavformat/ingenientdec.c b/libavformat/ingenientdec.c
index 94c549c..c0ba61e 100644
--- a/libavformat/ingenientdec.c
+++ b/libavformat/ingenientdec.c
@@ -21,8 +21,18 @@
 
 #include "avformat.h"
 #include "rawdec.h"
+#include "libavutil/intreadwrite.h"
+
+// http://multimedia.cx/ingenient.txt
+static int ingenient_probe(AVProbeData *p)
+{
+    if (   AV_RN32(p->buf) != AV_RN32("MJPG")
+        || p->buf_size < 50
+        || AV_RB16(p->buf + 48) != 0xffd8)
+        return 0;
+    return AVPROBE_SCORE_MAX * 3 / 4;
+}
 
-// http://www.artificis.hu/files/texts/ingenient.txt
 static int ingenient_read_packet(AVFormatContext *s, AVPacket *pkt)
 {
     int ret, size, w, h, unk1, unk2;
@@ -57,6 +67,7 @@ AVInputFormat ff_ingenient_demuxer = {
     .name           = "ingenient",
     .long_name      = NULL_IF_CONFIG_SMALL("raw Ingenient MJPEG"),
     .priv_data_size = sizeof(FFRawVideoDemuxerContext),
+    .read_probe     = ingenient_probe,
     .read_header    = ff_raw_video_read_header,
     .read_packet    = ingenient_read_packet,
     .flags          = AVFMT_GENERIC_INDEX,
diff --git a/libavformat/version.h b/libavformat/version.h
index 7ba0c71..f2dc0eb 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -31,7 +31,7 @@
 
 #define LIBAVFORMAT_VERSION_MAJOR  57
 #define LIBAVFORMAT_VERSION_MINOR  10
-#define LIBAVFORMAT_VERSION_MICRO 101
+#define LIBAVFORMAT_VERSION_MICRO 102
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                LIBAVFORMAT_VERSION_MINOR, \