Merge commit '92c1a83ee9394b39d68f6affd9104752a03714f8'

* commit '92c1a83ee9394b39d68f6affd9104752a03714f8': qsv: Fix loading multiple plugins Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-13 17:31:25 +01:00 · 2016-04-13 17:31:25 +01:00 · c182845068
parent bdd6275691 92c1a83ee9
commit c182845068
1 changed files with 2 additions and 0 deletions
--- a/libavcodec/qsv.c
+++ b/libavcodec/qsv.c
@ -219,6 +219,8 @@ int ff_qsv_init_internal_session(AVCodecContext *avctx, QSVSession *qs,
                goto load_plugin_fail;
            }

+            if (*load_plugins)
+                load_plugins++;
 load_plugin_fail:
            av_freep(&plugin);
            if (err < 0)