]> git.sesse.net Git - ffmpeg/commitdiff
mjpegenc: enable frame multithreading encoder
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Jun 2012 19:20:23 +0000 (21:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Jun 2012 23:38:47 +0000 (01:38 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mjpegenc.c

index 0bec8f20126b6554c59da0af416074a2ea06a2f2..385a361f24f6521bb4d98fa9735b25786fc15a1c 100644 (file)
@@ -504,7 +504,7 @@ AVCodec ff_mjpeg_encoder = {
     .init           = ff_MPV_encode_init,
     .encode2        = ff_MPV_encode_picture,
     .close          = ff_MPV_encode_end,
-    .capabilities   = CODEC_CAP_SLICE_THREADS | CODEC_CAP_INTRA_ONLY,
+    .capabilities   = CODEC_CAP_SLICE_THREADS | CODEC_CAP_FRAME_THREADS | CODEC_CAP_INTRA_ONLY,
     .pix_fmts       = (const enum PixelFormat[]){
         PIX_FMT_YUVJ420P, PIX_FMT_YUVJ422P, PIX_FMT_NONE
     },