diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-22 16:46:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-22 16:46:25 +0200 |
| commit | fbdbe7a5d262db06ae44a7bd606d18954241c040 (patch) | |
| tree | 782d065f8394f3c41ad0285b2d4ef33b4b682ac7 | |
| parent | e1b5a2e46ef0734d149c2cbbc8a5a82be100c617 (diff) | |
| parent | ecee1148af4989e1f9e16f0cdc9f98ad2045538c (diff) | |
| download | ffmpeg-fbdbe7a5d262db06ae44a7bd606d18954241c040.tar.gz | |
Merge commit 'ecee1148af4989e1f9e16f0cdc9f98ad2045538c'
* commit 'ecee1148af4989e1f9e16f0cdc9f98ad2045538c':
qsvenc_hevc: use the correct HW plugin UID
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/qsvenc_hevc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c index d0c577969e..3e7e0e6458 100644 --- 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, |