virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

lavf/ingenientdec: Add a probe function.

Browse Source
This commit is contained in:
Carl Eugen Hoyos
2015-10-24 13:28:32 +02:00
parent 9c069bf71a
commit a3bed3f3e1
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libavformat/ingenientdec.c
View File

@@ -21,8 +21,18 @@
#include "avformat.h" #include "avformat.h"
#include "rawdec.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) static int ingenient_read_packet(AVFormatContext *s, AVPacket *pkt)
{ {
int ret, size, w, h, unk1, unk2; int ret, size, w, h, unk1, unk2;
@@ -57,6 +67,7 @@ AVInputFormat ff_ingenient_demuxer = {
.name = "ingenient", .name = "ingenient",
.long_name = NULL_IF_CONFIG_SMALL("raw Ingenient MJPEG"), .long_name = NULL_IF_CONFIG_SMALL("raw Ingenient MJPEG"),
.priv_data_size = sizeof(FFRawVideoDemuxerContext), .priv_data_size = sizeof(FFRawVideoDemuxerContext),
.read_probe = ingenient_probe,
.read_header = ff_raw_video_read_header, .read_header = ff_raw_video_read_header,
.read_packet = ingenient_read_packet, .read_packet = ingenient_read_packet,
.flags = AVFMT_GENERIC_INDEX, .flags = AVFMT_GENERIC_INDEX,

2
libavformat/version.h
View File

@@ -31,7 +31,7 @@
#define LIBAVFORMAT_VERSION_MAJOR 57 #define LIBAVFORMAT_VERSION_MAJOR 57
#define LIBAVFORMAT_VERSION_MINOR 10 #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, \ #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \ LIBAVFORMAT_VERSION_MINOR, \