Merge commit 'ecee1148af4989e1f9e16f0cdc9f98ad2045538c'

* commit 'ecee1148af4989e1f9e16f0cdc9f98ad2045538c': qsvenc_hevc: use the correct HW plugin UID Merged-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago · fbdbe7a5d2
parent e1b5a2e46e ecee1148af
commit fbdbe7a5d2
1 changed files with 1 additions and 1 deletions
--- a/libavcodec/qsvenc_hevc.c
+++ b/libavcodec/qsvenc_hevc.c
@ -160,7 +160,7 @@ static av_cold int qsv_enc_init(AVCodecContext *avctx)

    if (q->load_plugin != LOAD_PLUGIN_NONE) {
        static const char *uid_hevcenc_sw = "2fca99749fdb49aeb121a5b63ef568f7";
-        static const char *uid_hevcenc_hw = "e5400a06c74d41f5b12d430bbaa23d0b";
+        static const char *uid_hevcenc_hw = "6fadc791a0c2eb479ab6dcd5ea9da347";

        if (q->qsv.load_plugins[0]) {
            av_log(avctx, AV_LOG_WARNING,