diff options
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/Makefile | 5 | ||||
| -rw-r--r-- | libavformat/allformats.c | 5 | ||||
| -rw-r--r-- | libavformat/img2dec.c | 55 | ||||
| -rw-r--r-- | libavformat/version.h | 4 |
4 files changed, 67 insertions, 2 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 813872ba48..c49f9de311 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -226,9 +226,14 @@ OBJS-$(CONFIG_IMAGE_EXR_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_J2K_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_JPEG_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER) += img2dec.o img2.o +OBJS-$(CONFIG_IMAGE_PAM_PIPE_DEMUXER) += img2dec.o img2.o +OBJS-$(CONFIG_IMAGE_PBM_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_PCX_PIPE_DEMUXER) += img2dec.o img2.o +OBJS-$(CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER) += img2dec.o img2.o +OBJS-$(CONFIG_IMAGE_PGM_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_PICTOR_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_PNG_PIPE_DEMUXER) += img2dec.o img2.o +OBJS-$(CONFIG_IMAGE_PPM_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_QDRAW_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_SGI_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER) += img2dec.o img2.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index ddf540ca03..d490cc4080 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -356,9 +356,14 @@ void av_register_all(void) REGISTER_DEMUXER (IMAGE_J2K_PIPE, image_j2k_pipe); REGISTER_DEMUXER (IMAGE_JPEG_PIPE, image_jpeg_pipe); REGISTER_DEMUXER (IMAGE_JPEGLS_PIPE, image_jpegls_pipe); + REGISTER_DEMUXER (IMAGE_PAM_PIPE, image_pam_pipe); + REGISTER_DEMUXER (IMAGE_PBM_PIPE, image_pbm_pipe); REGISTER_DEMUXER (IMAGE_PCX_PIPE, image_pcx_pipe); + REGISTER_DEMUXER (IMAGE_PGMYUV_PIPE, image_pgmyuv_pipe); + REGISTER_DEMUXER (IMAGE_PGM_PIPE, image_pgm_pipe); REGISTER_DEMUXER (IMAGE_PICTOR_PIPE, image_pictor_pipe); REGISTER_DEMUXER (IMAGE_PNG_PIPE, image_png_pipe); + REGISTER_DEMUXER (IMAGE_PPM_PIPE, image_ppm_pipe); REGISTER_DEMUXER (IMAGE_QDRAW_PIPE, image_qdraw_pipe); REGISTER_DEMUXER (IMAGE_SGI_PIPE, image_sgi_pipe); REGISTER_DEMUXER (IMAGE_SUNRAST_PIPE, image_sunrast_pipe); diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index 1b0e608013..9d6796ff3e 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -862,6 +862,56 @@ static int webp_probe(AVProbeData *p) return 0; } +static int pnm_magic_check(const AVProbeData *p, int magic) +{ + const uint8_t *b = p->buf; + + return b[0] == 'P' && b[1] == magic + '0'; +} + +static inline int pnm_probe(const AVProbeData *p) +{ + const uint8_t *b = p->buf; + + while (b[2] == '\r') + b++; + if (b[2] == '\n' && (b[3] == '#' || (b[3] >= '0' && b[3] <= '9'))) + return AVPROBE_SCORE_EXTENSION + 2; + return 0; +} + +static int pbm_probe(AVProbeData *p) +{ + return pnm_magic_check(p, 1) || pnm_magic_check(p, 4) ? pnm_probe(p) : 0; +} + +static inline int pgmx_probe(AVProbeData *p) +{ + return pnm_magic_check(p, 2) || pnm_magic_check(p, 5) ? pnm_probe(p) : 0; +} + +static int pgm_probe(AVProbeData *p) +{ + int ret = pgmx_probe(p); + return ret && !av_match_ext(p->filename, "pgmyuv") ? ret : 0; +} + +static int pgmyuv_probe(AVProbeData *p) // custom FFmpeg format recognized by file extension +{ + int ret = pgmx_probe(p); + return ret && av_match_ext(p->filename, "pgmyuv") ? ret : 0; +} + +static int ppm_probe(AVProbeData *p) +{ + return pnm_magic_check(p, 3) || pnm_magic_check(p, 6) ? pnm_probe(p) : 0; +} + +static int pam_probe(AVProbeData *p) +{ + return pnm_magic_check(p, 7) ? pnm_probe(p) : 0; +} + #define IMAGEAUTO_DEMUXER(imgname, codecid)\ static const AVClass imgname ## _class = {\ .class_name = AV_STRINGIFY(imgname) " demuxer",\ @@ -888,9 +938,14 @@ IMAGEAUTO_DEMUXER(exr, AV_CODEC_ID_EXR) IMAGEAUTO_DEMUXER(j2k, AV_CODEC_ID_JPEG2000) IMAGEAUTO_DEMUXER(jpeg, AV_CODEC_ID_MJPEG) IMAGEAUTO_DEMUXER(jpegls, AV_CODEC_ID_JPEGLS) +IMAGEAUTO_DEMUXER(pam, AV_CODEC_ID_PAM) +IMAGEAUTO_DEMUXER(pbm, AV_CODEC_ID_PBM) IMAGEAUTO_DEMUXER(pcx, AV_CODEC_ID_PCX) +IMAGEAUTO_DEMUXER(pgm, AV_CODEC_ID_PGM) +IMAGEAUTO_DEMUXER(pgmyuv, AV_CODEC_ID_PGMYUV) IMAGEAUTO_DEMUXER(pictor, AV_CODEC_ID_PICTOR) IMAGEAUTO_DEMUXER(png, AV_CODEC_ID_PNG) +IMAGEAUTO_DEMUXER(ppm, AV_CODEC_ID_PPM) IMAGEAUTO_DEMUXER(qdraw, AV_CODEC_ID_QDRAW) IMAGEAUTO_DEMUXER(sgi, AV_CODEC_ID_SGI) IMAGEAUTO_DEMUXER(sunrast, AV_CODEC_ID_SUNRAST) diff --git a/libavformat/version.h b/libavformat/version.h index 558a6d7ceb..0293b488c8 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,8 +32,8 @@ // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) // Also please add any ticket numbers that you belive might be affected here #define LIBAVFORMAT_VERSION_MAJOR 57 -#define LIBAVFORMAT_VERSION_MINOR 38 -#define LIBAVFORMAT_VERSION_MICRO 102 +#define LIBAVFORMAT_VERSION_MINOR 39 +#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |