From 8f16f0db43e5397bda08038d71c4f6cd9da76c9a Mon Sep 17 00:00:00 2001 From: Vincent PINON Date: Wed, 19 Feb 2014 00:39:59 +0100 Subject: [PATCH] clean encoding profiles using MLT presets & profiles add myself to contributors --- data/encodingprofiles.rc | 10 +- export/profiles.xml | 228 ++++++++++++++------------------------- src/main.cpp | 3 +- 3 files changed, 87 insertions(+), 154 deletions(-) diff --git a/data/encodingprofiles.rc b/data/encodingprofiles.rc index cb56b433..2bf78db9 100644 --- a/data/encodingprofiles.rc +++ b/data/encodingprofiles.rc @@ -3,13 +3,11 @@ DNxHD=vcodec=dnxhd vb=145000k acodec=pcm_s16le threads=%threads;mov Normal MPEG=vcodec=mpeg2video qscale=10 acodec=mp2 ac=2 ab=128k ar=48000 threads=%threads;mpg [proxy] -Normal MPEG=-f mpegts -acodec libmp3lame -ac 2 -ab 128k -ar 48000 -vcodec mpeg2video -g 5 -deinterlace -s 480x270 -vb 400k;ts +Normal MPEG=-f mpegts -acodec libmp3lame -ac 2 -ab 128k -ar 48000 -vcodec mpeg2video -g 5 -deinterlace -s 640x360 -vb 700k;ts [screengrab] -X246 mute=-vcodec libx264 -preset fast -threads 0;mkv -X246 with audio=-f alsa -i pulse -acodec libvorbis -ab 256k -vcodec libx264 -preset fast -threads 0;mkv +X246 mute=-vcodec libx264 -preset fast -threads 0;mkv +X246 with audio=-i pulse -acodec libvorbis -ab 256k -vcodec libx264 -preset fast -threads 0;mkv [video4linux] -Normal MPEG=f=mpeg acodec=mp2 ab=128k ar=48000 vcodec=mpeg2video minrate=0 vb=4000k;mpg - - +Normal MPEG=acodec=mp2 ab=128k ar=48000 vcodec=mpeg2video minrate=0 vb=4000k;mpg diff --git a/export/profiles.xml b/export/profiles.xml index 740f1fa3..6318fcc5 100644 --- a/export/profiles.xml +++ b/export/profiles.xml @@ -1,150 +1,84 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -DVD - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Media players - - - - - - Web sites - - - - - - - - - - - - Audio only - - - - - - - - Lossless / HQ - - - - - - - - - - - - Mobile devices - - - - - - Mobile devices - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main.cpp b/src/main.cpp index d850a45b..54dfd83d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -34,8 +34,9 @@ int main(int argc, char *argv[]) ki18n("Kdenlive"), VERSION, ki18n("An open source video editor."), KAboutData::License_GPL, - ki18n("Copyright © 2007–2013 Kdenlive authors")); + ki18n("Copyright © 2007–2014 Kdenlive authors")); aboutData.addAuthor(ki18n("Jean-Baptiste Mardelle"), ki18n("MLT and KDE SC 4 porting, main developer and maintainer"), "jb@kdenlive.org"); + aboutData.addAuthor(ki18n("Vincent Pinon"), ki18n("Interim maintainer, bugs fixing, minor functions, profiles updates, etc."), "vpinon@april.org"); aboutData.addAuthor(ki18n("Laurent Montel"), ki18n("Bugs fixing, clean up code, optimization etc."), "montel@kde.org"); aboutData.addAuthor(ki18n("Marco Gittler"), ki18n("MLT transitions and effects, timeline, audio thumbs"), "g.marco@freenet.de"); aboutData.addAuthor(ki18n("Dan Dennedy"), ki18n("Bug fixing, etc."), "dan@dennedy.org"); -- 2.39.2