From patchwork Sun Jun 28 14:43:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 20675 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 5EBBA44B0BC for ; Sun, 28 Jun 2020 18:50:24 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 35A7068B7C6; Sun, 28 Jun 2020 18:50:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vs1-f67.google.com (mail-vs1-f67.google.com [209.85.217.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 03A4768B4DA for ; Sun, 28 Jun 2020 18:50:18 +0300 (EEST) Received: by mail-vs1-f67.google.com with SMTP id r5so7933422vso.11 for ; Sun, 28 Jun 2020 08:50:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=K7aUQvdyrSNBPAx1m/zJK2cJYhqq6EtE8GbLUe0sO2c=; b=tlR4afNKq2Zbrbzd40Z+QFq8py77B0toUwNl4mYfI4ctmqXTbQ5j+5a/Ad0xOZyIaQ rjh4MoGf7LjHpteVHHqEycyqe61ASG7AWA/+OVqW6qkMG9meh0Dmllf7u628JG9eiyxt 2/47l9S4nrk6BceJpiKxS/WemX1TUyANq3n411ZDUEBDLprlSPnclKMEHNgykhzUPlOD y6FmGl5MWaFp+lxX6i6j2/umK1h0VI/kaswSp70Tmpo0lKqeD7m7VMFBJfOhDVFCaoYJ 8zqkjhMFL9gmBdOPUZDRkfjg9bNivexOMtcp4+avHUmcpRokRA4yUFow6CCxBU40QHxI hPBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=K7aUQvdyrSNBPAx1m/zJK2cJYhqq6EtE8GbLUe0sO2c=; b=NpROWtbo/pqavPDZm4mQQJwctbpdqL59vHnBtK7gHp6S/dNN1KHwzkcKHo0jyVKBdk gMhxeGZmCx8Lz7qdZ9p1C9ud6oz9i9KDee+1JAiPoiZMdxqvfuYF/I+xJsTxuUWuZTzt m0RqzCDppHUj6YjX9lkajszaMscUQEGTWFYE1AW5osbfhJEVJ3Yz40Ea+Fe7IOLYXyRx InFqGW1+aHzGqPc1yftKg0u79nW7Q160HyBCaLdAfV38ZFksGTtFWzB9rsjTlzkR/t9N Pun4EmRAs0xr8+9vvlf3xsbX01a733gu5LO6C4d6RoxaK3/TBXLj0NU7hvJn+KKT2deX huzg== X-Gm-Message-State: AOAM533C27sajpvS/YHSac+3MW2peMb9UU2wYW1GRkIJNjnJx5E7saRp edydlOFDwN2CiCjO1JsEDR7TfKxMuGI= X-Google-Smtp-Source: ABdhPJzh8Zm3oYael5XelCj8EYa1lk5P8yBzzXofFIemRizwsVMWrOvPnVkF90A8vt7y14Vq+FwzAA== X-Received: by 2002:a17:902:8546:: with SMTP id d6mr10234027plo.220.1593355416274; Sun, 28 Jun 2020 07:43:36 -0700 (PDT) Received: from localhost.localdomain ([122.181.59.182]) by smtp.gmail.com with ESMTPSA id d25sm26877338pgn.2.2020.06.28.07.43.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jun 2020 07:43:35 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Jun 2020 20:13:28 +0530 Message-Id: <20200628144329.7408-1-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH v3 1/2] libavcodec/pgxdec: Add PGX decoder X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Gautam Ramakrishnan MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Gautam Ramakrishnan This patch adds a pgx decoder. --- Changelog | 1 + doc/general.texi | 2 + libavcodec/Makefile | 1 + libavcodec/allcodecs.c | 1 + libavcodec/codec_desc.c | 7 ++ libavcodec/codec_id.h | 1 + libavcodec/pgxdec.c | 205 ++++++++++++++++++++++++++++++++++++++++ libavcodec/version.h | 2 +- 8 files changed, 219 insertions(+), 1 deletion(-) create mode 100644 libavcodec/pgxdec.c diff --git a/Changelog b/Changelog index a60e7d2eb8..1bb9931c0d 100644 --- a/Changelog +++ b/Changelog @@ -4,6 +4,7 @@ releases are sorted from youngest to oldest. version : - AudioToolbox output device - MacCaption demuxer +- PGX decoder version 4.3: diff --git a/doc/general.texi b/doc/general.texi index ea34b963b5..53d556c56c 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -751,6 +751,8 @@ following image formats are supported: @tab Portable GrayMap image @item PGMYUV @tab X @tab X @tab PGM with U and V components in YUV 4:2:0 +@item PGX @tab @tab X + @tab PGX file decoder @item PIC @tab @tab X @tab Pictor/PC Paint @item PNG @tab X @tab X diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 5a6ea59715..12aa43fe51 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -536,6 +536,7 @@ OBJS-$(CONFIG_PGM_ENCODER) += pnmenc.o OBJS-$(CONFIG_PGMYUV_DECODER) += pnmdec.o pnm.o OBJS-$(CONFIG_PGMYUV_ENCODER) += pnmenc.o OBJS-$(CONFIG_PGSSUB_DECODER) += pgssubdec.o +OBJS-$(CONFIG_PGX_DECODER) += pgxdec.o OBJS-$(CONFIG_PICTOR_DECODER) += pictordec.o cga_data.o OBJS-$(CONFIG_PIXLET_DECODER) += pixlet.o OBJS-$(CONFIG_PJS_DECODER) += textdec.o ass.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index fa0c08d42e..a5048290f7 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -238,6 +238,7 @@ extern AVCodec ff_pgm_encoder; extern AVCodec ff_pgm_decoder; extern AVCodec ff_pgmyuv_encoder; extern AVCodec ff_pgmyuv_decoder; +extern AVCodec ff_pgx_decoder; extern AVCodec ff_pictor_decoder; extern AVCodec ff_pixlet_decoder; extern AVCodec ff_png_encoder; diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 9f8847544f..67e0a3055c 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1405,6 +1405,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("AVS2-P2/IEEE1857.4"), .props = AV_CODEC_PROP_LOSSY, }, + { + .id = AV_CODEC_ID_PGX, + .type = AVMEDIA_TYPE_VIDEO, + .name = "pgx", + .long_name = NULL_IF_CONFIG_SMALL("PGX (JPEG2000 Test Format)"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + }, { .id = AV_CODEC_ID_Y41P, .type = AVMEDIA_TYPE_VIDEO, diff --git a/libavcodec/codec_id.h b/libavcodec/codec_id.h index d885962c9c..896ecb0ce0 100644 --- a/libavcodec/codec_id.h +++ b/libavcodec/codec_id.h @@ -241,6 +241,7 @@ enum AVCodecID { AV_CODEC_ID_SCREENPRESSO, AV_CODEC_ID_RSCC, AV_CODEC_ID_AVS2, + AV_CODEC_ID_PGX, AV_CODEC_ID_Y41P = 0x8000, AV_CODEC_ID_AVRP, diff --git a/libavcodec/pgxdec.c b/libavcodec/pgxdec.c new file mode 100644 index 0000000000..688846f797 --- /dev/null +++ b/libavcodec/pgxdec.c @@ -0,0 +1,205 @@ +/* + * PGX image format + * Copyright (c) 2020 Gautam Ramakrishnan + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "avcodec.h" +#include "internal.h" +#include "bytestream.h" +#include "libavutil/imgutils.h" + +typedef struct PGXContext { + GetByteContext g; +} PGXContext; + +static int pgx_get_number(AVCodecContext *avctx, PGXContext * const s) { + int ret = -1; + char digit; + int numdigits = 0; + + while (1) { + if (numdigits > 10) { + return -1; + } + if (!bytestream2_get_bytes_left(&s->g)) + return -1; + digit = bytestream2_get_byte(&s->g); + if (digit == ' ' || digit == 0xA || digit == 0xD) + break; + else if (digit < '0' || digit > '9') + return -1; + + if (ret < 0) + ret = 0; + ret = 10 * ret + (digit - '0'); + numdigits++; + } + + if (ret >= 0) + return ret; + return -1; +} + +static int ff_pgx_decode_header(AVCodecContext *avctx, PGXContext * s, + int *depth, int *width, int *height, + int *sign) +{ + int byte; + + if (bytestream2_get_bytes_left(&s->g) < 6) { + return AVERROR_INVALIDDATA; + } + + bytestream2_skip(&s->g, 6); + + // Is the component signed? + byte = bytestream2_peek_byte(&s->g); + if (byte == '+') { + *sign = 0; + bytestream2_skip(&s->g, 1); + } else if (byte == '-') { + *sign = 1; + bytestream2_skip(&s->g, 1); + } else if (byte == 0) + goto error; + + byte = bytestream2_peek_byte(&s->g); + if (byte == ' ') + bytestream2_skip(&s->g, 1); + else if (byte == 0) + goto error; + + *depth = pgx_get_number(avctx, s); + *width = pgx_get_number(avctx, s); + *height = pgx_get_number(avctx, s); + if (*depth <= 0 || *width <= 0 || *height <= 0) + goto error; + + if (bytestream2_peek_byte(&s->g) == 0xA) + bytestream2_skip(&s->g, 1); + return 0; + +error: + av_log(avctx, AV_LOG_ERROR, "Error in decoding header.\n"); + return AVERROR_INVALIDDATA; +} + +static inline int write_frame_8(AVPacket *avpkt, AVFrame *frame, PGXContext * const s, + int width, int height, int sign, int depth) +{ + int i, j; + for (i = 0; i < height; i++) { + uint8_t *line = frame->data[0] + i * frame->linesize[0]; + for (j = 0; j < width; j++) { + int val; + if (bytestream2_get_bytes_left(&s->g) < 1) + return AVERROR_INVALIDDATA; + if (sign) { + val = bytestream2_get_byte(&s->g) + (1 << (depth - 1)); + val <<= (8 - depth); + *(line + j) = val; + } else { + val = bytestream2_get_byteu(&s->g); + val <<= (8 - depth); + *(line + j) = val; + } + } + line += frame->linesize[0]; + } + return 0; +} + +static inline int write_frame_16(AVPacket *avpkt, AVFrame *frame, PGXContext * const s, + int width, int height, int sign, int depth) +{ + int i, j; + for (i = 0; i < height; i++) { + uint16_t *line = (uint16_t*)frame->data[0] + i*frame->linesize[0]/2; + for (j = 0; j < width; j++) { + int val; + if (bytestream2_get_bytes_left(&s->g) < 2) + return AVERROR_INVALIDDATA; + if (sign) { + val = (int16_t)bytestream2_get_be16(&s->g) + (1 << (depth - 1)); + val <<= (16 - depth); + *(line + j) = val; + } else { + val = bytestream2_get_be16u(&s->g); + val <<= (16 - depth); + *(line + j) = val; + } + } + line += frame->linesize[0]/2; + } + return 0; +} + +static int pgx_decode_frame(AVCodecContext *avctx, void *data, + int *got_frame, AVPacket *avpkt) +{ + PGXContext *s = avctx->priv_data; + AVFrame *p = data; + int ret; + int bpp; + int width, height, depth; + int sign = 0; + bytestream2_init(&s->g, avpkt->data, avpkt->size); + + if ((ret = ff_pgx_decode_header(avctx, s, &depth, &width, &height, &sign)) < 0) + return ret; + if (av_image_check_size(width, height, 0, avctx)) { + av_log(avctx, AV_LOG_ERROR, "Image too large.\n"); + return AVERROR_INVALIDDATA; + } + if (ret = ff_set_dimensions(avctx, width, height) < 0) + return ret; + + if (depth <= 8) { + avctx->pix_fmt = AV_PIX_FMT_GRAY8; + bpp = 8; + } else if (depth <= 16) { + avctx->pix_fmt = AV_PIX_FMT_GRAY16BE; + bpp = 16; + } else { + av_log(avctx, AV_LOG_ERROR, "Maximum depth of 16 bits supported.\n"); + return AVERROR_PATCHWELCOME; + } + + if ((ret = ff_get_buffer(avctx, p, 0)) < 0) + return ret; + *got_frame = 1; + p->pict_type = AV_PICTURE_TYPE_I; + p->key_frame = 1; + avctx->bits_per_raw_sample = depth; + if (bpp == 8) + write_frame_8(avpkt, p, s, width, height, sign, depth); + else if (bpp == 16) + write_frame_16(avpkt, p, s, width, height, sign, depth); + return 0; +} + +AVCodec ff_pgx_decoder = { + .name = "pgx", + .long_name = NULL_IF_CONFIG_SMALL("PGX (JPEG2000 Test Format)"), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_PGX, + .priv_data_size = sizeof(PGXContext), + .decode = pgx_decode_frame, + .capabilities = AV_CODEC_CAP_DR1, +}; diff --git a/libavcodec/version.h b/libavcodec/version.h index 03593026b3..482cc6d6ba 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,7 +28,7 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 58 -#define LIBAVCODEC_VERSION_MINOR 93 +#define LIBAVCODEC_VERSION_MINOR 94 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ From patchwork Sun Jun 28 14:43:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 20662 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id ED382448A42 for ; Sun, 28 Jun 2020 17:43:46 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CA51568B700; Sun, 28 Jun 2020 17:43:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0BAE168B112 for ; Sun, 28 Jun 2020 17:43:40 +0300 (EEST) Received: by mail-pl1-f174.google.com with SMTP id u9so2491887pls.13 for ; Sun, 28 Jun 2020 07:43:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=eWLYzixbP+MyhwjRKrdDdUTeaRHxHx+d133a/FjfkZI=; b=tTtFN4XhNqiXbb797EbT2xAcuz/T4vpwUkFHghLy+SbmBrl+EMj/Azv+oY9LQiG774 9/es4+REvHg95SvqaY71kt1zNuzL0MIsGt383JYTIBAtQg+RclaIpnkchnKnWTfYVwsZ 0bnKHfXlcK2k6/5myeBBoNyi1BKHoiwhdY8nBbo6P5c3adulXouJnqIjiwLf03fvRjFh HVK1qxSdRHihUSVIk82bkA8VdYV9iu2+t/qpr4LAFu1LCK9EEAmSZZ7Kcbjc4OU8cNd0 W8nWdvKNK1Ae0dUDOXv8eY+yihVG5nd32kHHPdtANuUUlR6XUNBFxApwv0fbA4bV6L95 1KEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=eWLYzixbP+MyhwjRKrdDdUTeaRHxHx+d133a/FjfkZI=; b=Y/3I1ZGGlOedco915JoT72jpn14z2EBCo6ktPQyiJkCpqkN6WQNmO+FN0WNHSJE1RG Dq+WOKJCMW0hjwlvqr20Ay4wcXw61RMuaKSDR4L/2kabFNVNsDha2OhLnNco7OO8SPQc yA29JAVFDvlUr67uK0sb5Q8LsyOggpGV2Uz6t8peOYkV28/pj09U6YtWVxj6e35uYkAz PCmjJUwIcyQlFe/LraxgVC80vdgW7VUIwOa+bJERaNi4FeB2AdIWhqoI1zjlaJw8pArr NVBuwEchRXdFrZSbHLQwlSF5ttudlBoptIwhcC7OiPzvwHfZ5aoGSWeeOxfQF1McRsCz 7f9g== X-Gm-Message-State: AOAM5300zqkutakPYBS5NozWFPUwoxiod5Gk0RgQaOpd6V0GkIHRUAI9 VMCKOY0UXS8vE3mFoY9i1bh+t+qCCJc= X-Google-Smtp-Source: ABdhPJwXKY7EKRCaZ1P56GZ0VD1Dg4ePS0BfTI/LAFRCWELaFFalugzKdGICTFo4TcrVH1lzhZNgsQ== X-Received: by 2002:a17:902:d892:: with SMTP id b18mr10494381plz.335.1593355418035; Sun, 28 Jun 2020 07:43:38 -0700 (PDT) Received: from localhost.localdomain ([122.181.59.182]) by smtp.gmail.com with ESMTPSA id d25sm26877338pgn.2.2020.06.28.07.43.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jun 2020 07:43:37 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Jun 2020 20:13:29 +0530 Message-Id: <20200628144329.7408-2-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200628144329.7408-1-gautamramk@gmail.com> References: <20200628144329.7408-1-gautamramk@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 2/2] libavformat/img2dec: Added pgx demuxer X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Gautam Ramakrishnan MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Gautam Ramakrishnan This patch adds support to demux pgx file format. --- libavformat/allformats.c | 1 + libavformat/img2dec.c | 10 ++++++++++ libavformat/version.h | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 97fd06debb..f8527b1fd4 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -488,6 +488,7 @@ extern AVInputFormat ff_image_pbm_pipe_demuxer; extern AVInputFormat ff_image_pcx_pipe_demuxer; extern AVInputFormat ff_image_pgmyuv_pipe_demuxer; extern AVInputFormat ff_image_pgm_pipe_demuxer; +extern AVInputFormat ff_image_pgx_pipe_demuxer; extern AVInputFormat ff_image_pictor_pipe_demuxer; extern AVInputFormat ff_image_png_pipe_demuxer; extern AVInputFormat ff_image_ppm_pipe_demuxer; diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index ee7ceed08f..ec27e04a30 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -1000,6 +1000,15 @@ static int pgmyuv_probe(const AVProbeData *p) // custom FFmpeg format recognized return ret && av_match_ext(p->filename, "pgmyuv") ? ret : 0; } +static int pgx_probe(const AVProbeData *p) +{ + const uint8_t *b = p->buf; + int ret = (AV_RB64(b) & 0xFFFFFFFFFFFF0000) == 0x5047204D4C200000; + if (ret) + return AVPROBE_SCORE_EXTENSION + 1; + return 0; +} + static int ppm_probe(const AVProbeData *p) { return pnm_magic_check(p, 3) || pnm_magic_check(p, 6) ? pnm_probe(p) : 0; @@ -1094,6 +1103,7 @@ 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(pgx, AV_CODEC_ID_PGX) IMAGEAUTO_DEMUXER(pictor, AV_CODEC_ID_PICTOR) IMAGEAUTO_DEMUXER(png, AV_CODEC_ID_PNG) IMAGEAUTO_DEMUXER(ppm, AV_CODEC_ID_PPM) diff --git a/libavformat/version.h b/libavformat/version.h index 3c1957b00c..75c03fde0a 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 47 +#define LIBAVFORMAT_VERSION_MINOR 48 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \