Merge remote-tracking branch 'cus/stable'

[ffmpeg] / libavcodec / libopenjpegenc.c

diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c
index 806209ade0ce15df93a318ba659ee7f418167f9f..da1249844a30ef930ce64505771cfc74fb1525b8 100644 (file)
--- a/libavcodec/libopenjpegenc.c
+++ b/libavcodec/libopenjpegenc.c
@@ -89,6 +89,8 @@ static opj_image_t *mj2_create_image(AVCodecContext *avctx, opj_cparameters_t *p
     case PIX_FMT_RGBA64:
         color_space = CLRSPC_SRGB;
         break;
+    case PIX_FMT_YUV410P:
+    case PIX_FMT_YUV411P:
     case PIX_FMT_YUV420P:
     case PIX_FMT_YUV422P:
     case PIX_FMT_YUV440P:
@@ -145,7 +147,6 @@ static av_cold int libopenjpeg_encode_init(AVCodecContext *avctx)
     ctx->enc_params.cp_fixed_quality = ctx->fixed_quality;
     ctx->enc_params.tcp_numlayers = ctx->numlayers;
     ctx->enc_params.tcp_rates[0] = FFMAX(avctx->compression_level, 0) * 2;
-    ctx->enc_params.cp_disto_alloc = 1;
 
     ctx->compress = opj_create_compress(ctx->format);
     if (!ctx->compress) {
@@ -334,6 +335,8 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
         cpyresult = libopenjpeg_copy_packed16(avctx, frame, image);
         break;
     case PIX_FMT_GRAY8:
+    case PIX_FMT_YUV410P:
+    case PIX_FMT_YUV411P:
     case PIX_FMT_YUV420P:
     case PIX_FMT_YUV422P:
     case PIX_FMT_YUV440P:
@@ -449,6 +452,7 @@ AVCodec ff_libopenjpeg_encoder = {
                                            PIX_FMT_GRAY8,PIX_FMT_GRAY8A,PIX_FMT_GRAY16,
                                            PIX_FMT_YUV420P,PIX_FMT_YUV422P,PIX_FMT_YUVA420P,
                                            PIX_FMT_YUV440P,PIX_FMT_YUV444P,
+                                           PIX_FMT_YUV411P,PIX_FMT_YUV410P,
                                            PIX_FMT_YUV420P9,PIX_FMT_YUV422P9,PIX_FMT_YUV444P9,
                                            PIX_FMT_YUV420P10,PIX_FMT_YUV422P10,PIX_FMT_YUV444P10,
                                            PIX_FMT_YUV420P16,PIX_FMT_YUV422P16,PIX_FMT_YUV444P16,