Commit ae17878f authored by Aleksi Nurmi's avatar Aleksi Nurmi Committed by Vittorio Giovara

BRender PIX image decoder

Further enhancements by Vittorio Giovara and Paul B Mahol.
Signed-off-by: 's avatarVittorio Giovara <vittorio.giovara@gmail.com>
parent c3a0b3eb
...@@ -6,6 +6,7 @@ version <next>: ...@@ -6,6 +6,7 @@ version <next>:
- shuffleplanes filter - shuffleplanes filter
- replaygain data export - replaygain data export
- Alias PIX image encoder and decoder - Alias PIX image encoder and decoder
- BRender PIX image decoder
version 10: version 10:
......
...@@ -430,6 +430,8 @@ following image formats are supported: ...@@ -430,6 +430,8 @@ following image formats are supported:
@tab Only uncompressed GIFs are generated. @tab Only uncompressed GIFs are generated.
@item BMP @tab X @tab X @item BMP @tab X @tab X
@tab Microsoft BMP image @tab Microsoft BMP image
@item BRender PIX @tab @tab X
@tab Argonaut BRender 3D engine image format.
@item DPX @tab X @tab X @item DPX @tab X @tab X
@tab Digital Picture Exchange @tab Digital Picture Exchange
@item JPEG @tab X @tab X @item JPEG @tab X @tab X
......
...@@ -126,6 +126,7 @@ OBJS-$(CONFIG_BMP_DECODER) += bmp.o msrledec.o ...@@ -126,6 +126,7 @@ OBJS-$(CONFIG_BMP_DECODER) += bmp.o msrledec.o
OBJS-$(CONFIG_BMP_ENCODER) += bmpenc.o OBJS-$(CONFIG_BMP_ENCODER) += bmpenc.o
OBJS-$(CONFIG_BMV_VIDEO_DECODER) += bmv.o OBJS-$(CONFIG_BMV_VIDEO_DECODER) += bmv.o
OBJS-$(CONFIG_BMV_AUDIO_DECODER) += bmv.o OBJS-$(CONFIG_BMV_AUDIO_DECODER) += bmv.o
OBJS-$(CONFIG_BRENDER_PIX_DECODER) += brenderpix.o
OBJS-$(CONFIG_C93_DECODER) += c93.o OBJS-$(CONFIG_C93_DECODER) += c93.o
OBJS-$(CONFIG_CAVS_DECODER) += cavs.o cavsdec.o cavsdsp.o \ OBJS-$(CONFIG_CAVS_DECODER) += cavs.o cavsdec.o cavsdsp.o \
cavsdata.o mpeg12data.o cavsdata.o mpeg12data.o
......
...@@ -112,6 +112,7 @@ void avcodec_register_all(void) ...@@ -112,6 +112,7 @@ void avcodec_register_all(void)
REGISTER_DECODER(BINK, bink); REGISTER_DECODER(BINK, bink);
REGISTER_ENCDEC (BMP, bmp); REGISTER_ENCDEC (BMP, bmp);
REGISTER_DECODER(BMV_VIDEO, bmv_video); REGISTER_DECODER(BMV_VIDEO, bmv_video);
REGISTER_DECODER(BRENDER_PIX, brender_pix);
REGISTER_DECODER(C93, c93); REGISTER_DECODER(C93, c93);
REGISTER_DECODER(CAVS, cavs); REGISTER_DECODER(CAVS, cavs);
REGISTER_DECODER(CDGRAPHICS, cdgraphics); REGISTER_DECODER(CDGRAPHICS, cdgraphics);
......
...@@ -285,6 +285,7 @@ enum AVCodecID { ...@@ -285,6 +285,7 @@ enum AVCodecID {
AV_CODEC_ID_HEVC, AV_CODEC_ID_HEVC,
AV_CODEC_ID_FIC, AV_CODEC_ID_FIC,
AV_CODEC_ID_ALIAS_PIX, AV_CODEC_ID_ALIAS_PIX,
AV_CODEC_ID_BRENDER_PIX,
/* various PCM "codecs" */ /* various PCM "codecs" */
AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs
......
This diff is collapsed.
...@@ -1108,6 +1108,13 @@ static const AVCodecDescriptor codec_descriptors[] = { ...@@ -1108,6 +1108,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
.long_name = NULL_IF_CONFIG_SMALL("ASCII/ANSI art"), .long_name = NULL_IF_CONFIG_SMALL("ASCII/ANSI art"),
.props = AV_CODEC_PROP_LOSSY, .props = AV_CODEC_PROP_LOSSY,
}, },
{
.id = AV_CODEC_ID_BRENDER_PIX,
.type = AVMEDIA_TYPE_VIDEO,
.name = "brender_pix",
.long_name = NULL_IF_CONFIG_SMALL("BRender PIX image"),
.props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS,
},
{ {
.id = AV_CODEC_ID_DPX, .id = AV_CODEC_ID_DPX,
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include "libavutil/version.h" #include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 55 #define LIBAVCODEC_VERSION_MAJOR 55
#define LIBAVCODEC_VERSION_MINOR 37 #define LIBAVCODEC_VERSION_MINOR 38
#define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
......
...@@ -56,6 +56,7 @@ static const IdStrMap img_tags[] = { ...@@ -56,6 +56,7 @@ static const IdStrMap img_tags[] = {
{ AV_CODEC_ID_TIFF, "tif" }, { AV_CODEC_ID_TIFF, "tif" },
{ AV_CODEC_ID_SGI, "sgi" }, { AV_CODEC_ID_SGI, "sgi" },
{ AV_CODEC_ID_PTX, "ptx" }, { AV_CODEC_ID_PTX, "ptx" },
{ AV_CODEC_ID_BRENDER_PIX,"pix" },
{ AV_CODEC_ID_PCX, "pcx" }, { AV_CODEC_ID_PCX, "pcx" },
{ AV_CODEC_ID_SUNRAST, "sun" }, { AV_CODEC_ID_SUNRAST, "sun" },
{ AV_CODEC_ID_SUNRAST, "ras" }, { AV_CODEC_ID_SUNRAST, "ras" },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment