Merge commit '43171886e08b6a2f20a1e2f3ecc95a7984b591cd'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 24 Apr 2015 19:48:19 +0000 (21:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 24 Apr 2015 19:48:27 +0000 (21:48 +0200)
* commit '43171886e08b6a2f20a1e2f3ecc95a7984b591cd':
  huffyuvenc: Mark codec as init-thread-safe and init-cleanup

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/huffyuvenc.c

@@@ -1092,25 -712,11 +1094,27 @@@ AVCodec ff_ffvhuff_encoder = 
      .init           = encode_init,
      .encode2        = encode_frame,
      .close          = encode_end,
 +    .capabilities   = CODEC_CAP_FRAME_THREADS | CODEC_CAP_INTRA_ONLY,
 +    .priv_class     = &ff_class,
      .pix_fmts       = (const enum AVPixelFormat[]){
 -        AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_RGB24,
 +        AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV411P,
 +        AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV440P,
 +        AV_PIX_FMT_GBRP,
 +        AV_PIX_FMT_GBRP9, AV_PIX_FMT_GBRP10, AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRP14,
 +        AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY16,
 +        AV_PIX_FMT_YUVA420P, AV_PIX_FMT_YUVA422P, AV_PIX_FMT_YUVA444P,
 +        AV_PIX_FMT_GBRAP,
 +        AV_PIX_FMT_GRAY8A,
 +        AV_PIX_FMT_YUV420P9, AV_PIX_FMT_YUV420P10, AV_PIX_FMT_YUV420P12, AV_PIX_FMT_YUV420P14, AV_PIX_FMT_YUV420P16,
 +        AV_PIX_FMT_YUV422P9, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV422P12, AV_PIX_FMT_YUV422P14, AV_PIX_FMT_YUV422P16,
 +        AV_PIX_FMT_YUV444P9, AV_PIX_FMT_YUV444P10, AV_PIX_FMT_YUV444P12, AV_PIX_FMT_YUV444P14, AV_PIX_FMT_YUV444P16,
 +        AV_PIX_FMT_YUVA420P9, AV_PIX_FMT_YUVA420P10, AV_PIX_FMT_YUVA420P16,
 +        AV_PIX_FMT_YUVA422P9, AV_PIX_FMT_YUVA422P10, AV_PIX_FMT_YUVA422P16,
 +        AV_PIX_FMT_YUVA444P9, AV_PIX_FMT_YUVA444P10, AV_PIX_FMT_YUVA444P16,
 +        AV_PIX_FMT_RGB24,
          AV_PIX_FMT_RGB32, AV_PIX_FMT_NONE
      },
+     .caps_internal  = FF_CODEC_CAP_INIT_THREADSAFE |
+                       FF_CODEC_CAP_INIT_CLEANUP,
  };
  #endif