Update proxy profiles

data/encodingprofiles.rc

@@ -4,8 +4,9 @@ DNxHD=vcodec=dnxhd vb=145000k acodec=pcm_s16le threads=%threads;mov
 MPEG=qscale=4 ab=192k vcodec=mpeg2video acodec=mp2 threads=%threads;mpg
 
 [proxy]
-x264=-vf scale=640:-2 -g 5 -crf 25 -ab 128k -vcodec libx264 -acodec libvorbis -preset veryfast;mov
-MPEG=-vf scale=640:-2 -g 5 -qscale 6 -ab 128k -vcodec mpeg2video -acodec mp2;mpg
+x264=-vf scale=960:-2 -g 1 -bf 0 -vb 0 -crf 20 -vcodec libx264 -ab 128k -acodec aac -preset veryfast;mov
+MPEG2=-vf scale=960:-2 -g 1 -bf 0 -vb 0 -qscale 6 -ab 128k -vcodec mpeg2video -acodec ac3;mpg
+MJPEG=-vf yadif,scale=960:-2 -qscale 3 -vcodec mjpeg -ab 128k -acodec pcm_s16le ;mkv
 
 [screengrab]
 X264 mute=-crf 25 -vcodec libx264 -preset veryfast -threads 0;mov

src/project/jobs/proxyclipjob.cpp

@@ -87,6 +87,9 @@ void ProxyJob::startJob()
                 // Make sure we get an even height
                 height += height % 2;
                 mltParameters << QStringLiteral("s=%1x%2").arg(width).arg(height);
+                if (t.contains(QStringLiteral("yadif"))) {
+                    mltParameters << QStringLiteral("progressive=1");
+                }
                 continue;
             } else {
                 t.replace(QLatin1Char(' '), QLatin1String("="));