GIT_SILENT Upgrade KDE Applications version to 15.12.3.

CCBUG: 359541

CMakeLists.txt

@@ -6,7 +6,7 @@ project(Kdenlive)
 # KDE Application Version, managed by release script
 set (KDE_APPLICATIONS_VERSION_MAJOR "15")
 set (KDE_APPLICATIONS_VERSION_MINOR "12")
-set (KDE_APPLICATIONS_VERSION_MICRO "1")
+set (KDE_APPLICATIONS_VERSION_MICRO "3")
 
 set(KDENLIVE_VERSION ${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO})
 cmake_minimum_required(VERSION 2.8.12)

data/encodingprofiles.rc

@@ -1,5 +1,5 @@
 [decklink]
-x246=crf=25 ab=192k vcodec=libx264 acodec=libvorbis ab=192k preset=veryfast threads=%threads;mov
+x264=crf=25 ab=192k vcodec=libx264 acodec=libvorbis ab=192k preset=veryfast threads=%threads;mov
 DNxHD=vcodec=dnxhd vb=145000k acodec=pcm_s16le threads=%threads;mov
 MPEG=qscale=4 ab=192k vcodec=mpeg2video acodec=mp2 threads=%threads;mpg
 
@@ -8,9 +8,9 @@ x264=-s 640x480 -g 5 -crf 25 -ab 128k -vcodec libx264 -acodec libvorbis -preset
 MPEG=-s 640x480 -g 5 -qscale 6 -ab 128k -vcodec mpeg2video -acodec mp2;mpg
 
 [screengrab]
-X246 mute=-crf 25 -vcodec libx264 -preset veryfast -threads 0;mov
-X246 with audio=-i pulse -crf 25 -ab 192k -vcodec libx264 -acodec libvorbis -preset veryfast -threads 0;mov
+X264 mute=-crf 25 -vcodec libx264 -preset veryfast -threads 0;mov
+X264 with audio=-i pulse -crf 25 -ab 192k -vcodec libx264 -acodec libvorbis -preset veryfast -threads 0;mov
 
 [video4linux]
-x246=crf=25 ab=192k vcodec=libx264 acodec=libvorbis ab=192k preset=veryfast threads=%threads;mov
+x264=crf=25 ab=192k vcodec=libx264 acodec=libvorbis ab=192k preset=veryfast threads=%threads;mov
 MPEG=qscale=4 ab=192k vcodec=mpeg2video acodec=mp2 threads=%threads;mpg

src/scopes/colorscopes/abstractgfxscopewidget.cpp

@@ -46,7 +46,7 @@ void AbstractGfxScopeWidget::mouseReleaseEvent(QMouseEvent *event)
 void AbstractGfxScopeWidget::slotRenderZoneUpdated(const QImage &frame)
 {
     QMutexLocker lock(&m_mutex);
-    m_scopeImage = frame.rgbSwapped();
+    m_scopeImage = frame;
     AbstractScopeWidget::slotRenderZoneUpdated();
 }