diff options
| author | Carl Eugen Hoyos <ceffmpeg@gmail.com> | 2020-10-08 09:34:55 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <ceffmpeg@gmail.com> | 2020-10-08 09:34:55 +0200 |
| commit | bc43588a71181a6b2ea01119a7551f0d76a37b32 (patch) | |
| tree | c570f3f4c313e9ac63abb248d58ea90dc8e46102 /libavformat | |
| parent | 1249698e1b424cff8e77e6a83cfdbc9d11e01aa7 (diff) | |
lavf/img2dec: Auto-detect Cintel scanner images.
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/allformats.c | 1 | ||||
| -rw-r--r-- | libavformat/img2dec.c | 12 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
3 files changed, 14 insertions, 1 deletions
diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 3912b60ec3..96b9bc2a0c 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -489,6 +489,7 @@ extern AVInputFormat ff_yuv4mpegpipe_demuxer; extern AVOutputFormat ff_yuv4mpegpipe_muxer; /* image demuxers */ 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_dpx_pipe_demuxer; extern AVInputFormat ff_image_exr_pipe_demuxer; diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index 9a3c9fad02..4f9bfc635a 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -684,6 +684,17 @@ static int bmp_probe(const AVProbeData *p) 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) { 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(cri, AV_CODEC_ID_CRI) IMAGEAUTO_DEMUXER(dds, AV_CODEC_ID_DDS) IMAGEAUTO_DEMUXER(dpx, AV_CODEC_ID_DPX) IMAGEAUTO_DEMUXER(exr, AV_CODEC_ID_EXR) diff --git a/libavformat/version.h b/libavformat/version.h index 6a601f0c92..86e0a232ee 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,7 +32,7 @@ // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 58 -#define LIBAVFORMAT_VERSION_MINOR 61 +#define LIBAVFORMAT_VERSION_MINOR 62 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ |