[FFmpeg-cvslog] Merge commit '92c1a83ee9394b39d68f6affd9104752a03714f8'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Wed Apr 13 17:31:25 2016 +0100| [c1828450686ce240f344924b5b5bcaa84ebdcd9f] | committer: Derek Buitenhuis

Merge commit '92c1a83ee9394b39d68f6affd9104752a03714f8'

* commit '92c1a83ee9394b39d68f6affd9104752a03714f8':
  qsv: Fix loading multiple plugins

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c1828450686ce240f344924b5b5bcaa84ebdcd9f
---

 libavcodec/qsv.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c
index fc22a64..11d453d 100644
--- 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)


======================================================================