diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-06-29 16:13:26 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-06-29 16:13:26 +0200 |
| commit | a876a4da4a926068a0a0c5c1a910be0e34f9e991 (patch) | |
| tree | 9a284dc40c48dc86265a6c8f52d0792e55b5e6ff /libavformat/img2dec.c | |
| parent | f6ab967eae497733f6adc12b30075980fd6eea98 (diff) | |
| download | ffmpeg-a876a4da4a926068a0a0c5c1a910be0e34f9e991.tar.gz | |
lavf/img2dec: Autodetect dds frames.
Diffstat (limited to 'libavformat/img2dec.c')
| -rw-r--r-- | libavformat/img2dec.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index 0830f0073c..772204cde6 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -609,6 +609,17 @@ static int bmp_probe(AVProbeData *p) return AVPROBE_SCORE_EXTENSION / 4; } +static int dds_probe(AVProbeData *p) +{ + const uint8_t *b = p->buf; + + if ( AV_RB64(b) == 0x444453207c000000 + && AV_RL32(b + 8) + && AV_RL32(b + 12)) + return AVPROBE_SCORE_MAX - 1; + return 0; +} + static int dpx_probe(AVProbeData *p) { const uint8_t *b = p->buf; @@ -799,6 +810,7 @@ AVInputFormat ff_image_ ## imgname ## _pipe_demuxer = {\ }; IMAGEAUTO_DEMUXER(bmp, AV_CODEC_ID_BMP) +IMAGEAUTO_DEMUXER(dds, AV_CODEC_ID_DDS) IMAGEAUTO_DEMUXER(dpx, AV_CODEC_ID_DPX) IMAGEAUTO_DEMUXER(exr, AV_CODEC_ID_EXR) IMAGEAUTO_DEMUXER(j2k, AV_CODEC_ID_JPEG2000) |