MFXVideoUSER_Load call is redundant since libmfx 1.28
---
Fixed merge conflict when applying this patch by 'git am'
libavcodec/qsv.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c
index 17720070f1..56a30ad642 100644
--- a/libavcodec/qsv.c
+++ b/libavcodec/qsv.c
@@ -19,7 +19,6 @@
*/
#include <mfx/mfxvideo.h>
-#include <mfx/mfxplugin.h>
#include <mfx/mfxjpeg.h>
#include <stdio.h>
@@ -36,6 +35,10 @@
#include "avcodec.h"
#include "qsv_internal.h"
+#if !QSV_VERSION_ATLEAST(1, 28)
+#include <mfx/mfxplugin.h>
+#endif
+
#if QSV_VERSION_ATLEAST(1, 12)
#include "mfx/mfxvp8.h"
#endif
@@ -295,6 +298,9 @@ enum AVPictureType ff_qsv_map_pictype(int mfx_pic_type)
static int qsv_load_plugins(mfxSession session, const char *load_plugins,
void *logctx)
{
+#if QSV_VERSION_ATLEAST(1, 28)
+ return 0;
+#else
if (!load_plugins || !*load_plugins)
return 0;
@@ -340,6 +346,7 @@ load_plugin_fail:
}
return 0;
+#endif
}
--
2.25.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
