Commit 73651090 authored by Paul B Mahol's avatar Paul B Mahol

avcodec: add Apple Pixlet decoder

Signed-off-by: 's avatarPaul B Mahol <onemda@gmail.com>
parent fdcb7a85
...@@ -11,6 +11,7 @@ version <next>: ...@@ -11,6 +11,7 @@ version <next>:
- PSD Decoder - PSD Decoder
- 16.8 floating point pcm decoder - 16.8 floating point pcm decoder
- 24.0 floating point pcm decoder - 24.0 floating point pcm decoder
- Apple Pixlet decoder
version 3.2: version 3.2:
- libopenmpt demuxer - libopenmpt demuxer
......
...@@ -631,6 +631,7 @@ following image formats are supported: ...@@ -631,6 +631,7 @@ following image formats are supported:
@item ANSI/ASCII art @tab @tab X @item ANSI/ASCII art @tab @tab X
@item Apple Intermediate Codec @tab @tab X @item Apple Intermediate Codec @tab @tab X
@item Apple MJPEG-B @tab @tab X @item Apple MJPEG-B @tab @tab X
@item Apple Pixlet @tab @tab X
@item Apple ProRes @tab X @tab X @item Apple ProRes @tab X @tab X
@item Apple QuickDraw @tab @tab X @item Apple QuickDraw @tab @tab X
@tab fourcc: qdrw @tab fourcc: qdrw
......
...@@ -452,6 +452,7 @@ OBJS-$(CONFIG_PGMYUV_DECODER) += pnmdec.o pnm.o ...@@ -452,6 +452,7 @@ OBJS-$(CONFIG_PGMYUV_DECODER) += pnmdec.o pnm.o
OBJS-$(CONFIG_PGMYUV_ENCODER) += pnmenc.o OBJS-$(CONFIG_PGMYUV_ENCODER) += pnmenc.o
OBJS-$(CONFIG_PGSSUB_DECODER) += pgssubdec.o OBJS-$(CONFIG_PGSSUB_DECODER) += pgssubdec.o
OBJS-$(CONFIG_PICTOR_DECODER) += pictordec.o cga_data.o OBJS-$(CONFIG_PICTOR_DECODER) += pictordec.o cga_data.o
OBJS-$(CONFIG_PIXLET_DECODER) += pixlet.o
OBJS-$(CONFIG_PJS_DECODER) += textdec.o ass.o OBJS-$(CONFIG_PJS_DECODER) += textdec.o ass.o
OBJS-$(CONFIG_PNG_DECODER) += png.o pngdec.o pngdsp.o OBJS-$(CONFIG_PNG_DECODER) += png.o pngdec.o pngdsp.o
OBJS-$(CONFIG_PNG_ENCODER) += png.o pngenc.o OBJS-$(CONFIG_PNG_ENCODER) += png.o pngenc.o
......
...@@ -281,6 +281,7 @@ void avcodec_register_all(void) ...@@ -281,6 +281,7 @@ void avcodec_register_all(void)
REGISTER_ENCDEC (PGM, pgm); REGISTER_ENCDEC (PGM, pgm);
REGISTER_ENCDEC (PGMYUV, pgmyuv); REGISTER_ENCDEC (PGMYUV, pgmyuv);
REGISTER_DECODER(PICTOR, pictor); REGISTER_DECODER(PICTOR, pictor);
REGISTER_DECODER(PIXLET, pixlet);
REGISTER_ENCDEC (PNG, png); REGISTER_ENCDEC (PNG, png);
REGISTER_ENCDEC (PPM, ppm); REGISTER_ENCDEC (PPM, ppm);
REGISTER_ENCDEC (PRORES, prores); REGISTER_ENCDEC (PRORES, prores);
......
...@@ -412,6 +412,7 @@ enum AVCodecID { ...@@ -412,6 +412,7 @@ enum AVCodecID {
AV_CODEC_ID_SHEERVIDEO, AV_CODEC_ID_SHEERVIDEO,
AV_CODEC_ID_YLC, AV_CODEC_ID_YLC,
AV_CODEC_ID_PSD, AV_CODEC_ID_PSD,
AV_CODEC_ID_PIXLET,
/* 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
......
...@@ -1339,6 +1339,13 @@ static const AVCodecDescriptor codec_descriptors[] = { ...@@ -1339,6 +1339,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
.long_name = NULL_IF_CONFIG_SMALL("YUY2 Lossless Codec"), .long_name = NULL_IF_CONFIG_SMALL("YUY2 Lossless Codec"),
.props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS,
}, },
{
.id = AV_CODEC_ID_PIXLET,
.type = AVMEDIA_TYPE_VIDEO,
.name = "pixlet",
.long_name = NULL_IF_CONFIG_SMALL("Apple Pixlet"),
.props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY,
},
/* image codecs */ /* image codecs */
{ {
......
This diff is collapsed.
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include "libavutil/version.h" #include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 57 #define LIBAVCODEC_VERSION_MAJOR 57
#define LIBAVCODEC_VERSION_MINOR 69 #define LIBAVCODEC_VERSION_MINOR 70
#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
......
...@@ -296,6 +296,8 @@ const AVCodecTag ff_codec_movvideo_tags[] = { ...@@ -296,6 +296,8 @@ const AVCodecTag ff_codec_movvideo_tags[] = {
{ AV_CODEC_ID_SHEERVIDEO, MKTAG('S', 'h', 'r', '6') }, { AV_CODEC_ID_SHEERVIDEO, MKTAG('S', 'h', 'r', '6') },
{ AV_CODEC_ID_SHEERVIDEO, MKTAG('S', 'h', 'r', '7') }, { AV_CODEC_ID_SHEERVIDEO, MKTAG('S', 'h', 'r', '7') },
{ AV_CODEC_ID_PIXLET, MKTAG('p', 'x', 'l', 't') },
{ AV_CODEC_ID_NONE, 0 }, { AV_CODEC_ID_NONE, 0 },
}; };
......
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