Merge branch 'master' into widgets

examples/QMLPlayer/qml/QMLPlayer/ControlPanel.qml

@@ -176,6 +176,7 @@ Rectangle {
         property alias video: video
         VideoPreview {
             id: video
+            opengl: false
             visible: PlayerConfig.previewEnabled
             fillMode: VideoOutput.Stretch
             anchors.top: parent.top

src/VideoFrameExtractor.cpp

@@ -1,3 +1,24 @@
+/******************************************************************************
+    QtAV:  Media play library based on Qt and FFmpeg
+    Copyright (C) 2014-2015 Wang Bin <wbsecg1@gmail.com>
+
+*   This file is part of QtAV
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+******************************************************************************/
+
 #include "QtAV/VideoFrameExtractor.h"
 #include <QtCore/QCoreApplication>
 #include <QtCore/QQueue>
@@ -99,10 +120,10 @@ public:
         dec_opt_normal["avcodec"] = opt; // avcodec need correct string or value in libavcodec
         codecs
 #if QTAV_HAVE(DXVA)
-                     << "DXVA"
+                    // << "DXVA"
 #endif //QTAV_HAVE(DXVA)
 #if QTAV_HAVE(VAAPI)
-                     << "VAAPI"
+                    // << "VAAPI"
 #endif //QTAV_HAVE(VAAPI)
 #if QTAV_HAVE(CEDARV)
                     //<< "Cedarv"

src/output/video/VideoOutput.cpp

@@ -112,6 +112,8 @@ bool VideoOutput::receive(const VideoFrame& frame)
     d.source_aspect_ratio = frame.displayAspectRatio();
     d.impl->d_func().source_aspect_ratio = d.source_aspect_ratio;
     setInSize(frame.width(), frame.height());
+    QMutexLocker locker(&d.impl->dptr.pri<VideoRendererPrivate>().img_mutex);
+    Q_UNUSED(locker);
     return d.impl->receiveFrame(frame);
 }
 /*