RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavf/img2dec: Auto-detect Cintel scanner images.

This commit is contained in:
Carl Eugen Hoyos 2020-10-08 09:34:55 +02:00
parent 1249698e1b
commit bc43588a71
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/allformats.c
View File

@ -489,6 +489,7 @@ extern AVInputFormat ff_yuv4mpegpipe_demuxer;
extern AVOutputFormat ff_yuv4mpegpipe_muxer; extern AVOutputFormat ff_yuv4mpegpipe_muxer;
/* image demuxers */ /* image demuxers */
extern AVInputFormat ff_image_bmp_pipe_demuxer; extern AVInputFormat ff_image_bmp_pipe_demuxer;
extern AVInputFormat ff_image_cri_pipe_demuxer;
extern AVInputFormat ff_image_dds_pipe_demuxer; extern AVInputFormat ff_image_dds_pipe_demuxer;
extern AVInputFormat ff_image_dpx_pipe_demuxer; extern AVInputFormat ff_image_dpx_pipe_demuxer;
extern AVInputFormat ff_image_exr_pipe_demuxer; extern AVInputFormat ff_image_exr_pipe_demuxer;

12
libavformat/img2dec.c
View File

@ -684,6 +684,17 @@ static int bmp_probe(const AVProbeData *p)
return AVPROBE_SCORE_EXTENSION / 4; return AVPROBE_SCORE_EXTENSION / 4;
} }
static int cri_probe(const AVProbeData *p)
{
const uint8_t *b = p->buf;
if ( AV_RL32(b) == 1
&& AV_RL32(b + 4) == 4
&& AV_RN32(b + 8) == AV_RN32("DVCC"))
return AVPROBE_SCORE_MAX - 1;
return 0;
}
static int dds_probe(const AVProbeData *p) static int dds_probe(const AVProbeData *p)
{ {
const uint8_t *b = p->buf; const uint8_t *b = p->buf;
@ -1101,6 +1112,7 @@ AVInputFormat ff_image_ ## imgname ## _pipe_demuxer = {\
}; };
IMAGEAUTO_DEMUXER(bmp, AV_CODEC_ID_BMP) IMAGEAUTO_DEMUXER(bmp, AV_CODEC_ID_BMP)
IMAGEAUTO_DEMUXER(cri, AV_CODEC_ID_CRI)
IMAGEAUTO_DEMUXER(dds, AV_CODEC_ID_DDS) IMAGEAUTO_DEMUXER(dds, AV_CODEC_ID_DDS)
IMAGEAUTO_DEMUXER(dpx, AV_CODEC_ID_DPX) IMAGEAUTO_DEMUXER(dpx, AV_CODEC_ID_DPX)
IMAGEAUTO_DEMUXER(exr, AV_CODEC_ID_EXR) IMAGEAUTO_DEMUXER(exr, AV_CODEC_ID_EXR)

2
libavformat/version.h
View File

@ -32,7 +32,7 @@
// Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium)
// Also please add any ticket numbers that you believe might be affected here // Also please add any ticket numbers that you believe might be affected here
#define LIBAVFORMAT_VERSION_MAJOR 58 #define LIBAVFORMAT_VERSION_MAJOR 58
#define LIBAVFORMAT_VERSION_MINOR 61 #define LIBAVFORMAT_VERSION_MINOR 62
#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_MICRO 100
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \