Commit be64629a authored by Maxim Poliakovski's avatar Maxim Poliakovski Committed by Martin Storsjö

Apple ProRes decoder

Signed-off-by: 's avatarMartin Storsjö <martin@martin.st>
parent b14629e5
...@@ -47,6 +47,7 @@ easier to use. The changes are: ...@@ -47,6 +47,7 @@ easier to use. The changes are:
- split filter - split filter
- libcdio-paranoia input device for audio CD grabbing - libcdio-paranoia input device for audio CD grabbing
- select filter - select filter
- Apple ProRes decoder
version 0.7: version 0.7:
......
...@@ -341,6 +341,7 @@ following image formats are supported: ...@@ -341,6 +341,7 @@ following image formats are supported:
@tab Used in Chinese MP3 players. @tab Used in Chinese MP3 players.
@item ANSI/ASCII art @tab @tab X @item ANSI/ASCII art @tab @tab X
@item Apple MJPEG-B @tab @tab X @item Apple MJPEG-B @tab @tab X
@item Apple ProRes @tab @tab X
@item Apple QuickDraw @tab @tab X @item Apple QuickDraw @tab @tab X
@tab fourcc: qdrw @tab fourcc: qdrw
@item Asus v1 @tab X @tab X @item Asus v1 @tab X @tab X
......
...@@ -295,6 +295,7 @@ OBJS-$(CONFIG_PNG_DECODER) += png.o pngdec.o ...@@ -295,6 +295,7 @@ OBJS-$(CONFIG_PNG_DECODER) += png.o pngdec.o
OBJS-$(CONFIG_PNG_ENCODER) += png.o pngenc.o OBJS-$(CONFIG_PNG_ENCODER) += png.o pngenc.o
OBJS-$(CONFIG_PPM_DECODER) += pnmdec.o pnm.o OBJS-$(CONFIG_PPM_DECODER) += pnmdec.o pnm.o
OBJS-$(CONFIG_PPM_ENCODER) += pnmenc.o pnm.o OBJS-$(CONFIG_PPM_ENCODER) += pnmenc.o pnm.o
OBJS-$(CONFIG_PRORES_DECODER) += proresdec.o
OBJS-$(CONFIG_PTX_DECODER) += ptx.o OBJS-$(CONFIG_PTX_DECODER) += ptx.o
OBJS-$(CONFIG_QCELP_DECODER) += qcelpdec.o celp_math.o \ OBJS-$(CONFIG_QCELP_DECODER) += qcelpdec.o celp_math.o \
celp_filters.o acelp_vectors.o \ celp_filters.o acelp_vectors.o \
......
...@@ -164,6 +164,7 @@ void avcodec_register_all(void) ...@@ -164,6 +164,7 @@ void avcodec_register_all(void)
REGISTER_DECODER (PICTOR, pictor); REGISTER_DECODER (PICTOR, pictor);
REGISTER_ENCDEC (PNG, png); REGISTER_ENCDEC (PNG, png);
REGISTER_ENCDEC (PPM, ppm); REGISTER_ENCDEC (PPM, ppm);
REGISTER_DECODER (PRORES, prores);
REGISTER_DECODER (PTX, ptx); REGISTER_DECODER (PTX, ptx);
REGISTER_DECODER (QDRAW, qdraw); REGISTER_DECODER (QDRAW, qdraw);
REGISTER_DECODER (QPEG, qpeg); REGISTER_DECODER (QPEG, qpeg);
......
This diff is collapsed.
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#define AVCODEC_VERSION_H #define AVCODEC_VERSION_H
#define LIBAVCODEC_VERSION_MAJOR 53 #define LIBAVCODEC_VERSION_MAJOR 53
#define LIBAVCODEC_VERSION_MINOR 10 #define LIBAVCODEC_VERSION_MINOR 11
#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, \
......
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