lavc: add libdcadec decoder

[ffmpeg] / libavcodec / libopenjpegdec.c

diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c
index fbc648ef6034b71605e42ff354f382422a0f9150..73b1b9f71edb5fd52b873cd01d677c8cb403faf6 100644 (file)
--- a/libavcodec/libopenjpegdec.c
+++ b/libavcodec/libopenjpegdec.c
@@ -43,9 +43,9 @@
 // pix_fmts with lower bpp have to be listed before
 // similar pix_fmts with higher bpp.
 #define RGB_PIXEL_FORMATS  AV_PIX_FMT_RGB24, AV_PIX_FMT_RGBA,                 \
-                           AV_PIX_FMT_RGB48
+                           AV_PIX_FMT_RGB48, AV_PIX_FMT_RGBA64
 
-#define GRAY_PIXEL_FORMATS AV_PIX_FMT_GRAY8, AV_PIX_FMT_Y400A,                \
+#define GRAY_PIXEL_FORMATS AV_PIX_FMT_GRAY8, AV_PIX_FMT_YA8,                  \
                            AV_PIX_FMT_GRAY16
 
 #define YUV_PIXEL_FORMATS  AV_PIX_FMT_YUV410P,   AV_PIX_FMT_YUV411P,          \
@@ -74,7 +74,7 @@ static const enum AVPixelFormat any_pix_fmts[] = {
     RGB_PIXEL_FORMATS, GRAY_PIXEL_FORMATS, YUV_PIXEL_FORMATS, XYZ_PIXEL_FORMATS
 };
 
-typedef struct {
+typedef struct LibOpenJPEGContext {
     AVClass *class;
     opj_dparameters_t dec_params;
     int lowres;