Merge commit '5d2daebf3cc8de4cee1973db6a2229beaad3b7cd'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 29 Sep 2015 12:12:47 +0000 (14:12 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 29 Sep 2015 12:12:47 +0000 (14:12 +0200)
* commit '5d2daebf3cc8de4cee1973db6a2229beaad3b7cd':
  qsvenc: mark the encoders as INIT_CLEANUP

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/qsvenc_h264.c
libavcodec/qsvenc_hevc.c
libavcodec/qsvenc_mpeg2.c

index b569efe..0e5a26c 100644 (file)
@@ -135,4 +135,5 @@ AVCodec ff_h264_qsv_encoder = {
                                                     AV_PIX_FMT_NONE },
     .priv_class     = &class,
     .defaults       = qsv_enc_defaults,
+    .caps_internal  = FF_CODEC_CAP_INIT_CLEANUP,
 };
index d1f1b17..eb43c49 100644 (file)
@@ -269,4 +269,5 @@ AVCodec ff_hevc_qsv_encoder = {
                                                     AV_PIX_FMT_NONE },
     .priv_class     = &class,
     .defaults       = qsv_enc_defaults,
+    .caps_internal  = FF_CODEC_CAP_INIT_CLEANUP,
 };
index 6b28bfd..2b3b1f7 100644 (file)
@@ -114,4 +114,5 @@ AVCodec ff_mpeg2_qsv_encoder = {
                                                     AV_PIX_FMT_NONE },
     .priv_class     = &class,
     .defaults       = qsv_enc_defaults,
+    .caps_internal  = FF_CODEC_CAP_INIT_CLEANUP,
 };