Imported Debian version 2.5.0~trusty1.1

[deb_ffmpeg.git] / ffmpeg / libavcodec / dvenc.c

diff --git a/ffmpeg/libavcodec/dvenc.c b/ffmpeg/libavcodec/dvenc.c
index a3868c4e1add51fc980c94895b27ef9ed969117b..5d810e3bf50246bbc052acab8f0a83d8395b6dbc 100644 (file)
--- a/ffmpeg/libavcodec/dvenc.c
+++ b/ffmpeg/libavcodec/dvenc.c
@@ -758,7 +758,7 @@ AVCodec ff_dvvideo_encoder = {
     .init           = dvvideo_encode_init,
     .encode2        = dvvideo_encode_frame,
     .close          = dvvideo_encode_close,
-    .capabilities   = CODEC_CAP_SLICE_THREADS,
+    .capabilities   = CODEC_CAP_SLICE_THREADS | CODEC_CAP_FRAME_THREADS | CODEC_CAP_INTRA_ONLY,
     .pix_fmts       = (const enum AVPixelFormat[]) {
         AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV422P,
         AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE