diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-08-08 21:19:29 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-08-08 22:43:15 +0200 |
| commit | 4b63bcef907b410facfb337340fb81fe9f1e58f7 (patch) | |
| tree | 7562b231325bcc638bd1a9514a158fe54ebc2998 /libavformat/img2dec.c | |
| parent | 0dcebb9f6345ecc7fa2f184c48cc5a21a3011b93 (diff) | |
| download | ffmpeg-4b63bcef907b410facfb337340fb81fe9f1e58f7.tar.gz | |
Autodetect jpeg-ls files.
Diffstat (limited to 'libavformat/img2dec.c')
| -rw-r--r-- | libavformat/img2dec.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index 272adac69d..b9a1bcfb66 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -609,6 +609,15 @@ static int j2k_probe(AVProbeData *p) return 0; } +static int jpegls_probe(AVProbeData *p) +{ + const uint8_t *b = p->buf; + + if (AV_RB32(b) == 0xffd8fff7) + return AVPROBE_SCORE_EXTENSION + 1; + return 0; +} + static int pictor_probe(AVProbeData *p) { const uint8_t *b = p->buf; @@ -690,6 +699,7 @@ IMAGEAUTO_DEMUXER(bmp, AV_CODEC_ID_BMP) IMAGEAUTO_DEMUXER(dpx, AV_CODEC_ID_DPX) IMAGEAUTO_DEMUXER(exr, AV_CODEC_ID_EXR) IMAGEAUTO_DEMUXER(j2k, AV_CODEC_ID_JPEG2000) +IMAGEAUTO_DEMUXER(jpegls, AV_CODEC_ID_JPEGLS) IMAGEAUTO_DEMUXER(pictor, AV_CODEC_ID_PICTOR) IMAGEAUTO_DEMUXER(png, AV_CODEC_ID_PNG) IMAGEAUTO_DEMUXER(sgi, AV_CODEC_ID_SGI) |