Merge commit 'ecee1148af4989e1f9e16f0cdc9f98ad2045538c'
authorMichael Niedermayer <michael@niedermayer.cc>
Wed, 22 Jul 2015 14:46:01 +0000 (16:46 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 22 Jul 2015 14:46:25 +0000 (16:46 +0200)
* commit 'ecee1148af4989e1f9e16f0cdc9f98ad2045538c':
  qsvenc_hevc: use the correct HW plugin UID

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/qsvenc_hevc.c

index d0c5779..3e7e0e6 100644 (file)
@@ -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,