Merge commit '74a1cad7e3ba79e5b1e5b2e2bcf6179520442679'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 24 Apr 2015 20:20:41 +0000 (22:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 24 Apr 2015 20:21:00 +0000 (22:21 +0200)
* commit '74a1cad7e3ba79e5b1e5b2e2bcf6179520442679':
  lclenc: Mark codec as init-thread-safe and init-cleanup

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

@@@ -197,6 -197,7 +197,8 @@@ AVCodec ff_zlib_encoder = 
      .init           = encode_init,
      .encode2        = encode_frame,
      .close          = encode_end,
 +    .capabilities   = CODEC_CAP_FRAME_THREADS | CODEC_CAP_INTRA_ONLY,
      .pix_fmts       = (const enum AVPixelFormat[]) { AV_PIX_FMT_BGR24, AV_PIX_FMT_NONE },
+     .caps_internal  = FF_CODEC_CAP_INIT_THREADSAFE |
+                       FF_CODEC_CAP_INIT_CLEANUP,
  };