@@ -1,4 +1,19 @@

 -------------------------------------------------------------------

+Tue Mar 08 16:09:34 UTC 2016 - joerg.lorenzen@ki.tng.de

+

+- Update to version 2.6.12

+  + [H264] Fixed crash when saving h264 annexB in avi (Brundle)

+  + [Vdpau] Fixed VDPAU resize and deinterlace when height is padded

+  + [Mkv] Faster loading of VP9 and h265

+  + [MP4] Supports more flavors of H265

+  + [i18n] Spanish translation update by ringmaster

+  + [Edit] Another frame seeking bug fixed, happened rarely

+  + [All] Slightly better crash handler

+  + [FFmpeg]Update to 2.7.6

+  + [Muxer] Basic webm support

+  + [Jobs] Fixed right click menus with qt5

+

+-------------------------------------------------------------------

 Fri Feb 05 21:02:11 UTC 2016 - joerg.lorenzen@ki.tng.de

 - Update to version 2.6.11

​

@@ -27,7 +27,7 @@

 Name:           avidemux3

 Summary:        Graphical video editing and transcoding tool

-Version:        2.6.11

+Version:        2.6.12

 Release:        1

 Url:            http://avidemux.sourceforge.net/

 Source0:        avidemux_%{version}.tar.gz

@@ -48,9 +48,8 @@

 Patch4:         avidemux-package_version.patch

 Patch5:         avidemux-bootStrap.patch

 Patch6:         avidemux-cpu_armel.patch

-Patch7:         avidemux-ADM_VERSION.patch

-Patch8:         avidemux-cmake-permissions.patch

-Patch9:         avidemux-find-lrelease-qt5.patch

+Patch7:         avidemux-cmake-permissions.patch

+Patch8:         avidemux-find-lrelease-qt5.patch

 License:        GPL-2.0

 Group:          Productivity/Multimedia/Video/Editors and Convertors

@@ -258,8 +257,8 @@

 find ./ -name '*.sql' -exec dos2unix -q {} \;

 find ./ -name '*.txt' -exec dos2unix -q {} \;

 find . -type f -exec sed -i -e 's|intfloat_readwrite.h|intfloat.h|g' {} \;

-sed -i -e 's|set(FFMPEG_VERSION "2.7.2")|set(FFMPEG_VERSION "%{ffmpeg_version}")|g' cmake/admFFmpegBuild.cmake

-rm -f avidemux_core/ffmpeg_package/ffmpeg-2.7.2.tar.bz2

+sed -i -e 's|set(FFMPEG_VERSION "2.7.6")|set(FFMPEG_VERSION "%{ffmpeg_version}")|g' cmake/admFFmpegBuild.cmake

+rm -f avidemux_core/ffmpeg_package/ffmpeg-2.7.6.tar.bz2

 cp %{S:2} avidemux_core/ffmpeg_package/

 pushd avidemux_core/ffmpeg_package/patches

 rm -f config.mak.diff

@@ -288,10 +287,9 @@

 %patch4 -p0

 %patch5 -p0

 %patch6 -p0

-%patch7 -p0

-%patch8 -p1

+%patch7 -p1

 %if %{with build_qt5}

-%patch9 -p0

+%patch8 -p0

 %endif

 chmod 755 bootStrap.bash

 chmod 644 AUTHORS COPYING README

@@ -452,6 +450,7 @@

 %{_libdir}/ADM_plugins6/muxers/libADM_mx_mp4.so

 %{_libdir}/ADM_plugins6/muxers/libADM_mx_mp4v2.so

 %{_libdir}/ADM_plugins6/muxers/libADM_mx_raw.so

+%{_libdir}/ADM_plugins6/muxers/libADM_mx_Webm.so

 %{_libdir}/ADM_plugins6/pluginSettings/x264/3/ultraFast.json

 %{_libdir}/ADM_plugins6/pluginSettings/x264/3/PSP.json

 %{_libdir}/ADM_plugins6/pluginSettings/x264/3/veryFast.json

​

@@ -1,21 +0,0 @@

---- avidemux/common/main.cpp.orig  2014-11-28 22:27:34.739989392 +0100

-+++ avidemux/common/main.cpp   2014-11-28 22:27:19.253254919 +0100

-@@ -137,7 +137,7 @@

- int startAvidemux(int argc, char *argv[])

- {

-     printf("*************************\n");

--    printf("  Avidemux v"ADM_VERSION);

-+    printf("  Avidemux v",ADM_VERSION);

- 

- #if defined( ADM_SUBVERSION )

- #define MKSTRING(x) x

---- avidemux/gtk/CMakeLists.txt.orig   2014-11-28 22:42:25.006820533 +0100

-+++ avidemux/gtk/CMakeLists.txt    2014-11-28 22:42:25.039819908 +0100

-@@ -34,6 +34,7 @@

- 

- SDLify(../common/main.cpp)

- ADD_SOURCE_CFLAGS(../common/main.cpp "-DADM_SUBVERSION=\"${ADM_SUBVERSION}\"")

-+ADD_SOURCE_CFLAGS(../common/main.cpp "-DADM_VERSION='\"${AVIDEMUX_VERSION}\"'")

- 

- ###########################################

- # Version Info

​

@@ -116,6 +116,7 @@

                     bool        updateImageTiming(_SEGMENT *seg,ADMImage *image);

                     // Need to get the image just before targetPts

                     bool        decodeTillPictureAtPts(uint64_t targetPts,ADMImage *image);

+                    bool        getFrameNumFromPtsOrBefore(_VIDEOS *v,uint64_t refTime,int &frameNumber);

 protected:

                                 /// Decode frame and on until frame is popped out of decoders

​

@@ -20,6 +20,9 @@

 #include "fourcc.h"

 #include "ADM_edit.hxx"

 #include "ADM_vidMisc.h"

+

+#define pivotPrintf(...) {}

+

 /**

     \fn getNKFramePTS

 */

@@ -216,6 +219,59 @@

     }

     return false;

 }

+/** 

+ * \fn getFrameNumberBeforePts

+ * \brief Search the framenumber that has a valid PTS = what's given or  before

+ *         it can be equal to refTime

+ * @param v

+ * @param refTime

+ * @param frameNumber

+ * @return 

+ */

+bool ADM_Composer::getFrameNumFromPtsOrBefore(_VIDEOS *v,uint64_t refTime,int &frameNumber)

+{

+    uint32_t nbFrame = v->_nb_video_frames;

+    uint64_t pts, dts;

+    uint32_t curFrame=nbFrame >> 1;

+    uint32_t splitMoval = curFrame >> 1;

+    pivotPrintf("Looking for frame with a pts   %s\n",ADM_us2plain(refTime));

+    // Try to find the frame that as the timestamp close enough to refTime, while being smaller

+    do 

+    {

+        // seems like the pts determination, not always works -> retry if necessary

+        bool worked;

+        do {

+                pts=ADM_NO_PTS;

+                worked = v->_aviheader->getPtsDts(curFrame,&pts,&dts);

+                if (worked && pts != ADM_NO_PTS) 

+                    break; // found                

+                curFrame--;

+                if (!curFrame)

+                {

+                        ADM_warning("The whole segment is corrupted. Abort the search");

+                        return false;

+                }

+        } while(true);

+        pivotPrintf("SplitMoval=%d\n",splitMoval);

+        if(pts==refTime)

+            break;

+        if (!splitMoval) 

+            break;        

+        pivotPrintf("Pivot time is %d, %s\n",curFrame,ADM_us2plain(pts));

+        if (pts >= refTime)

+                curFrame -= splitMoval;

+        else

+                curFrame += splitMoval;

+        splitMoval >>= 1;

+        pivotPrintf("Split=%d\n",splitMoval);        

+    } while(refTime != pts);

+

+    pivotPrintf("-Matching frame is %d, time is  %s\n",curFrame,ADM_us2plain(pts));

+    if (pts > refTime && curFrame)

+            curFrame--;

+    frameNumber=curFrame;

+    return true;

+}

 /**

     \fn searchPreviousKeyFrameInRef

     \brief Search next key frame in ref video ref

@@ -224,57 +280,49 @@

     @param nkTime : Time of the ref video

 */

+

 bool ADM_Composer::searchPreviousKeyFrameInRef(int ref,uint64_t refTime,uint64_t *nkTime)

 {

     // Search for the current frame with quick search

     _VIDEOS *v = _segments.getRefVideo(ref);

     uint32_t nbFrame = v->_nb_video_frames;

     uint64_t pts, dts;

-   uint32_t curFrame=nbFrame >> 1;

-   uint32_t splitMoval = curFrame >> 1;

-   do {

-       // seems like the pts determination, not always works -> retry if necessary

-       bool worked;

-       do {

-           worked = v->_aviheader->getPtsDts(curFrame,&pts,&dts);

-           if (!worked || pts == ADM_NO_PTS) {

-               curFrame++;

-               if (curFrame == nbFrame) {

-                   ADM_warning("The whole segment is corrupted. Abort the search");

-                   return false;

-               }

-           } else

-               break;

-       } while(true);

-

-       if (splitMoval != 0) {

-           if (pts >= refTime)

-               curFrame -= splitMoval;

-           else

-               curFrame += splitMoval;

-           splitMoval >>= 1;

-       } else

-           break;

-   } while(refTime != pts);

+    int curFrame;

-   if (pts < refTime)

-       curFrame++;

-   for (int i=curFrame; i>=0; i--) 

-        {

-        uint64_t p;

-        uint32_t flags;

-                v->_aviheader->getFlags(i,&flags);

-                if(!(flags & AVI_KEY_FRAME)) continue;

-       if(!v->_aviheader->getPtsDts(i,&pts,&dts) || pts == ADM_NO_PTS)

-                {

-           ADM_warning("The keyframe with PTS less than %"PRIu32"ms is corrupted\n",refTime/1000);

-                        continue;

-                }

-                if(pts>=refTime) continue;

-       *nkTime = pts;

-       return true;

-   }

-    ADM_warning("Cannot find keyframe with PTS less than %"PRIu32"ms\n",refTime/1000);

+    // look up the frame we are starting from...

+    if(!getFrameNumFromPtsOrBefore(v,refTime,curFrame))

+    {

+        ADM_warning("Cannot locate the frame we are talking about at PTS=%s\n",ADM_us2plain(refTime));

+        return false;

+    }

+    // rewind until we find a keyframe

+    for (int i=curFrame; i>=0; i--) 

+    {

+    uint64_t p;

+    uint32_t flags;

+            v->_aviheader->getFlags(i,&flags);

+            if(!(flags & AVI_KEY_FRAME)) 

+                continue;

+            if(!v->_aviheader->getPtsDts(i,&pts,&dts))

+                continue;

+            if(pts == ADM_NO_PTS)

+                continue;

+            pivotPrintf("-- Previous Kf ! This one is %s\n",ADM_us2plain(pts));

+            pivotPrintf("-- Ref is %s\n",ADM_us2plain(refTime));

+            pivotPrintf("-- DTS %s\n",ADM_us2plain(dts));

+            if(pts>=refTime) 

+                continue;

+            *nkTime = pts; // ok found it

+#if 0            

+            for(int j=0;j<5;j++)

+            {

+                 if(!v->_aviheader->getPtsDts(i+j,&pts,&dts)) continue ;

+                 printf("Neighbor [%d] = %s\n",j,ADM_us2plain(pts));

+            }

+#endif            

+            return true;

+    }

+    ADM_warning("Cannot find keyframe with PTS less than %s\n",ADM_us2plain(refTime));

     return false;

 }

​

@@ -105,8 +105,9 @@

     {

         if(labs((int64_t)lastDts-(int64_t)packetBufferDts)>ADM_ALLOWED_DRIFT_US)

         {

-            printf("[Composer::getPCMPacket] Track %d,%"PRIx64" : drift %d, computed :%"PRIu64" got %"PRIu64"\n",

-                        (int)myTrackNumber,(uint64_t)trk,(int)(lastDts-packetBufferDts),lastDts,packetBufferDts);

+            ADM_info("[Composer::getPCMPacket] Track %d,%"PRIx64" : drift %d, computed :%s",

+                        (int)myTrackNumber,(uint64_t)trk,(int)(lastDts-packetBufferDts),ADM_us2plain(lastDts));

+            ADM_info(" got %s\n", ADM_us2plain(packetBufferDts));

             if(packetBufferDts<lastDts)

             {

                 printf("[Composer::getPCMPacket] Track %d:%"PRIx64" : Dropping packet %"PRIu32" last =%"PRIu32"\n",myTrackNumber,(uint64_t)trk,(uint32_t)(lastDts/1000),(uint32_t)(packetBufferDts/1000));

​

@@ -249,7 +249,9 @@

     context->pix_fmt = PIX_FMT_YUV420P;

     video_body->getExtraHeaderData(&extraLen,&extraData);

-    context->extradata=extraData;

+    // duplicate extraData with malloc scheme, it will be freed by the bitstream filter

+    context->extradata=(uint8_t*)av_malloc(extraLen);

+    memcpy( context->extradata,extraData,extraLen);

     context->extradata_size=extraLen;

     codecContext=(void *)context;

​

@@ -250,24 +250,27 @@

         uint32_t extraLen;

         video_body->getExtraHeaderData(&extraLen,&extra);

 //#warning do something better

-        ADM_videoStreamCopy *copy=NULL;

+        ADM_videoStreamCopy *copy=NULL;        

         if(isH264Compatible(info.fcc))

         {

+            bool isAnnexB=!extraLen; // this is not very good

             if(muxer->preferH264AnnexB())

             {

-                ADM_info("The video stream is H264\n");

+                ADM_info("The video stream is a flavor of H264\n");

                 ADM_info("The muxer prefers AnnexB H264 bitstream\n");

-                if(extraLen)

+                if(!isAnnexB)

                 {

                     // Need to do mp4 to annexB    

-                    ADM_info("Probably AnnexB bitstream\n");

+                    ADM_info("Input is probably MP4 bitstream\n");

                     copy=new ADM_videoStreamCopyToAnnexB(markerA,markerB);

                 }

             }else

             {

-                if(!extraLen)

+                ADM_info("The video stream is a flavor of H264\n");

+                ADM_info("The muxer prefers MP4 style H264 bitstream\n");

+                if(isAnnexB)

                 {

-                    ADM_info("Probably AnnexB bitstream\n");

+                    ADM_info("Input is probably AnnexB bitstream\n");

                     copy=new ADM_videoStreamCopyFromAnnexB(markerA,markerB);

                 }

             }

@@ -275,6 +278,7 @@

         if(!copy)

         {

+            ADM_info("Simple copy mode engaged\n");

             copy=new ADM_videoStreamCopy(markerA,markerB);

         }

         video=copy;

​

@@ -172,7 +172,7 @@

 int startAvidemux(int argc, char *argv[])

 {

     printf("*************************\n");

-    printf("  Avidemux v"ADM_VERSION);

+    printf("  Avidemux v%s", ADM_VERSION);

 #if defined( ADM_SUBVERSION )

 #define MKSTRING(x) x

​

@@ -1605,4 +1605,14 @@

 {

         return;

 }

+/**

+*/

+bool UI_setDisplayName(const char *name)

+{

+        return true;

+}

+bool         UI_reset(void)

+{

+        return true;

+}

 // EOF

​

@@ -112,7 +112,7 @@

        xinfo->display = 0;

        xinfo->window = getMainNSWindow();

 #else

-       xinfo->window = GDK_WINDOW_XID(win);

+       xinfo->systemWindowId = GDK_WINDOW_XID(win);

        xinfo->display = GDK_WINDOW_XDISPLAY(parentWin);

 #endif

​

@@ -33,7 +33,8 @@

 ADD_SUBDIRECTORY(ADM_userInterfaces ./ADM_userInterfacesGtk)

 SDLify(../common/main.cpp)

-ADD_SOURCE_CFLAGS(../common/main.cpp "-DADM_SUBVERSION=\"${ADM_SUBVERSION}\"")

+ADD_SOURCE_CFLAGS(../common/main.cpp "-DADM_SUBVERSION='\"${ADM_SUBVERSION}\"'")

+ADD_SOURCE_CFLAGS(../common/main.cpp "-DADM_VERSION='\"${AVIDEMUX_VERSION}\"'")

 ###########################################

 # Version Info

​

@@ -153,10 +153,10 @@

    ui.tableWidget->addAction(runNow);

    ui.tableWidget->addAction(setOk);

    ui.tableWidget->addAction(setReady);

-   connect(del,SIGNAL(activated()),this,    SLOT(del()));

-   connect(runNow,SIGNAL(activated()),this, SLOT(runNow()));

-   connect(setOk,SIGNAL(activated()),this,  SLOT(setOk()));

-   connect(setReady,SIGNAL(activated()),this,SLOT(setReady()));

+   connect(del,SIGNAL(triggered()),this,    SLOT(del()));

+   connect(runNow,SIGNAL(triggered()),this, SLOT(runNow()));

+   connect(setOk,SIGNAL(triggered()),this,  SLOT(setOk()));

+   connect(setReady,SIGNAL(triggered()),this,SLOT(setReady()));

    connect(ui.pushButtonQuit,SIGNAL(pressed()),this,SLOT(quit()));

    connect(ui.pushButtonRunAll,SIGNAL(pressed()),this,SLOT(runAllJob()));

@@ -263,18 +263,22 @@

 void jobWindow::del(void)

 {

+    ADM_info("Del\n");

     runAction(JobAction_delete);

 }

 void jobWindow::setOk(void)

 {

+    ADM_info("Ok\n");

     runAction(JobAction_setOk);

 }

 void jobWindow::setReady(void)

 {

+    ADM_info("setReady\n");

     runAction(JobAction_setReady);

 }

 void jobWindow::runNow(void)

 {

+    ADM_info("runNow\n");

     runAction(JobAction_runNow);

 }

​

@@ -18,6 +18,7 @@

 #include <QKeyEvent>

 #include <QGraphicsView>

 #include <QtCore/QDir>

+#include <QMessageBox>

 #include "ADM_cpp.h"

 #define MENU_DECLARE

 #include "Q_gui2.h"

@@ -928,7 +929,17 @@

 */

 static void FatalFunctionQt(const char *title, const char *info)

 {

-   GUI_Info_HIG(ADM_LOG_IMPORTANT, title, info);

+    printf("Crash Dump for %s\n",title);

+    printf("%s\n",info);

+    fflush(stdout);

+    

+    QMessageBox msgBox;

+    msgBox.setText(title);

+    msgBox.setInformativeText(QT_TR_NOOP("The application has encountered a fatal problem\nThe current editing has been saved and will be reloaded at next start"));

+    msgBox.setDetailedText(info);

+    msgBox.setIcon(QMessageBox::Critical);

+    msgBox.exec();

+    abort();

 }

 /**

​

@@ -84,7 +84,7 @@

                                         label,  // caption

                                         str,    // folder

                                         filterFile,   // filter

-                                        NULL);   // selected filter

+                                        NULL,QFileDialog::DontConfirmOverwrite);   // selected filter

        if (fileName.isNull() ) return;

​

@@ -13,12 +13,11 @@

     </message>

     <message>

         <source>MPEG-2 requant</source>

-        <translation type="obsolete">Cuantizador MPEG</translation>

+        <translation type="obsolete">recuantizar MPEG-2</translation>

     </message>

     <message>

         <source>dummy</source>

-        <translation type="obsolete">

-            </translation>

+        <translation type="obsolete">vacio</translation>

     </message>

     <message>

         <source>Copy</source>

@@ -30,8 +29,7 @@

     </message>

     <message>

         <source>Dummy</source>

-        <translation type="obsolete">

-            </translation>

+        <translation type="obsolete">Vacio</translation>

     </message>

     <message>

         <source>None</source>

@@ -56,16 +54,16 @@

     <message>

         <source>The beginning frame is not a key frame.

 Please move the A marker.</source>

-        <translation type="obsolete">La imagen inicial no es un Imagen-Clave

+        <translation type="obsolete">La imagen inicial no es una Imagen-Clave

 Desplace el marcador A.</translation>

     </message>

     <message>

         <source>_Use systray while encoding</source>

-        <translation type="obsolete">Minimizar en el tray al codificar</translation>

+        <translation type="obsolete">_Minimizar al codificar</translation>

     </message>

     <message>

         <source>_Accept non-standard audio frequency for DVD</source>

-        <translation type="obsolete">Permitir frecuencia de sonido no estándar para DVD</translation>

+        <translation type="obsolete">_Permitir frecuencia de sonido no estándar para DVD</translation>

     </message>

     <message>

         <source>Create _OpenDML files</source>

@@ -73,27 +71,27 @@

     </message>

     <message>

         <source>Automatically _index MPEG files</source>

-        <translation type="obsolete">Indexar automáticamente archivos MPEG</translation>

+        <translation type="obsolete">_Indexar automáticamente archivos MPEG</translation>

     </message>

     <message>

         <source>Automatically _swap A and B if A&gt;B</source>

-        <translation type="obsolete">Indexar automáticamente archivos MPEG</translation>

+        <translation type="obsolete">Intercambiar _automaticamente A y B si A&gt;B</translation>

     </message>

     <message>

         <source>_Disable NUV audio sync</source>

-        <translation type="obsolete">Desactivar sincronización de audio NUV</translation>

+        <translation type="obsolete">_Desactivar sincronización de audio NUV</translation>

     </message>

     <message>

         <source>Automatically _build VBR map</source>

-        <translation type="obsolete">Construir automáticamente mapa VBR</translation>

+        <translation type="obsolete">_Construir automáticamente mapa VBR</translation>

     </message>

     <message>

         <source>Automatically _rebuild index</source>

-        <translation type="obsolete">Reconstruir automáticamente el índice</translation>

+        <translation type="obsolete">_Reconstruir automáticamente el índice</translation>

     </message>

     <message>

         <source>Automatically remove _packed bitstream</source>

-        <translation type="obsolete">Eliminar automáticamente el empaquetado bitstream</translation>

+        <translation type="obsolete">Eliminar automáticamente el em_paquetado bitstream</translation>

     </message>

     <message>

         <source>SIMD</source>

@@ -137,11 +135,11 @@

     </message>

     <message>

         <source>_lavc threads:</source>

-        <translation type="obsolete">Procesos Xvid:</translation>

+        <translation type="obsolete">Hilos _lavc:</translation>

     </message>

     <message>

         <source>Multi-threading</source>

-        <translation type="obsolete">Multi-tarea</translation>

+        <translation type="obsolete">Multi-hilo</translation>

     </message>

     <message>

         <source>Above normal</source>

@@ -157,15 +155,15 @@

     </message>

     <message>

         <source>_Encoding priority:</source>

-        <translation type="obsolete">Prioridad de codificación:</translation>

+        <translation type="obsolete">_Prioridad de codificación:</translation>

     </message>

     <message>

         <source>_Indexing/unpacking priority:</source>

-        <translation type="obsolete">Prioridad de Indexado/descompresión:</translation>

+        <translation type="obsolete">Prioridad de _Indexado/descompresión:</translation>

     </message>

     <message>

         <source>_Playback priority:</source>

-        <translation type="obsolete">Prioridad de reproducción:</translation>

+        <translation type="obsolete">Prioridad de _reproducción:</translation>

     </message>

     <message>

         <source>Prioritisation</source>

@@ -173,7 +171,7 @@

     </message>

     <message>

         <source>_Use alternative tag for MP3 in .mp4</source>

-        <translation type="obsolete">Usar un tag alternativo para MP3 en .mp4</translation>

+        <translation type="obsolete">_Usar tag alternativo para MP3 en .mp4</translation>

     </message>

     <message>

         <source>XVideo (best)</source>

@@ -185,7 +183,7 @@

     </message>

     <message>

         <source>Video _display:</source>

-        <translation type="obsolete">Bitrate vídeo:</translation>

+        <translation type="obsolete">Mostrar _Video:</translation>

     </message>

     <message>

         <source>No alerts</source>

@@ -201,7 +199,7 @@

     </message>

     <message>

         <source>_Message level:</source>

-        <translation type="obsolete">Nivel de mensaje:</translation>

+        <translation type="obsolete">Nivel de _mensaje:</translation>

     </message>

     <message>

         <source>Master</source>

@@ -209,11 +207,11 @@

     </message>

     <message>

         <source>_Volume control:</source>

-        <translation type="obsolete">Control de volumen:</translation>

+        <translation type="obsolete">Control de _Volumen:</translation>

     </message>

     <message>

         <source>No downmixing</source>

-        <translation type="obsolete">Sin downmixing (multicanal)</translation>

+        <translation type="obsolete">Sin downmixing</translation>

     </message>

     <message>

         <source>Pro Logic</source>

@@ -225,7 +223,7 @@

     </message>

     <message>

         <source>_Local playback downmixing:</source>

-        <translation type="obsolete">Downmixing de reproducción Local:</translation>

+        <translation type="obsolete">Downmixing de reproducción _Local:</translation>

     </message>

     <message>

         <source>De_ringing</source>

@@ -304,7 +302,7 @@

     </message>

     <message>

         <source>Timecode:</source>

-        <translation type="obsolete">Marca de tiempo:</translation>

+        <translation type="obsolete">Marcador de tiempo:</translation>

     </message>

     <message>

         <source>_Dynamic range compression</source>

@@ -901,7 +899,7 @@

     </message>

     <message>

         <source>Marker A &gt; B</source>

-        <translation type="obsolete">Marcador A &gt; B</translation>

+        <translation type="obsolete">Marcadordor A &gt; B</translation>

     </message>

     <message>

         <source>Cannot copy.</source>

@@ -2140,8 +2138,7 @@

     </message>

     <message>

         <source>Smart Copy</source>

-        <translation type="obsolete">

-            </translation>

+        <translation type="obsolete">Copia Inteligente</translation>

     </message>

     <message>

         <source>Trouble initializing audio device</source>

@@ -4262,7 +4259,7 @@

     </message>

     <message>

         <source>Timecode:</source>

-        <translation type="unfinished">Marca de tiempo:</translation>

+        <translation type="unfinished">Marcador de tiempo:</translation>

     </message>

     <message>

         <source>0/0</source>

@@ -5640,35 +5637,35 @@

     </message>

     <message>

         <source>Open</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Abrir</translation>

     </message>

     <message>

         <source>Append</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Anexar</translation>

     </message>

     <message>

         <source>Save</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Guardar</translation>

     </message>

     <message>

         <source>Queue</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Cola</translation>

     </message>

     <message>

         <source>Save as Image</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Guardar como Imagen</translation>

     </message>

     <message>

         <source>Save as BMP</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Guardar como BMP</translation>

     </message>

     <message>

         <source>Save as JPEG</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Guardar como JPEG</translation>

     </message>

     <message>

         <source>Close</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Cerrar</translation>

     </message>

     <message>

         <source>-</source>

@@ -5676,27 +5673,27 @@

     </message>

     <message>

         <source>Information</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Información</translation>

     </message>

     <message>

         <source>Connect to avsproxy</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Conectar a avsproxy</translation>

     </message>

     <message>

         <source>Quit</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Salir</translation>

     </message>

     <message>

         <source>Undo</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Deshacer</translation>

     </message>

     <message>

         <source>Reset Edit</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Deshacer edición</translation>

     </message>

     <message>

         <source>Cut</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Cortar</translation>

     </message>

     <message>

         <source>Copy</source>

@@ -5704,27 +5701,27 @@

     </message>

     <message>

         <source>Paste</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Pegar</translation>

     </message>

     <message>

         <source>Delete</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Borrar</translation>

     </message>

     <message>

         <source>Set Marker A</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Establecer Marcador A</translation>

     </message>

     <message>

         <source>Set Marker B</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Establecer Marcador B</translation>

     </message>

     <message>

         <source>Decoder Option</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Opción Descodificador</translation>

     </message>

     <message>

         <source>PostProcessing</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">PostProcesado</translation>

     </message>

     <message>

         <source>Filters</source>

@@ -5732,15 +5729,15 @@

     </message>

     <message>

         <source>Select Track</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Seleccionar Pista</translation>

     </message>

     <message>

         <source>Save audio</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Guardar sonido</translation>

     </message>

     <message>

         <source>Build Option</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Opciones de versión</translation>

     </message>

     <message>

         <source>Plugins</source>

@@ -5748,19 +5745,19 @@

     </message>

     <message>

         <source>&amp;Advanced</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">&amp;Avanzado</translation>

     </message>

     <message>

         <source>Open Application &amp;Log</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Abrir Registro &amp;Aplicación</translation>

     </message>

     <message>

         <source>Open Application Data &amp;Folder</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Abrir Carpeta Datos &amp;Aplicación</translation>

     </message>

     <message>

         <source>About</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Acerca de...</translation>

     </message>

     <message>

         <source>Play/Stop</source>

@@ -5768,47 +5765,47 @@

     </message>

     <message>

         <source>Previous Frame</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Imagen Anterior</translation>

     </message>

     <message>

         <source>Next Frame</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Imagen Siguiente</translation>

     </message>

     <message>

         <source>Previous Intra Frame</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Imagen-Clave Anterior</translation>

     </message>

     <message>

         <source>Next Intra Frame</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Imagen-Clave Siguiente</translation>

     </message>

     <message>

         <source>Previous Black Frame</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Imagen Negra Anterior</translation>

     </message>

     <message>

         <source>Next Black Frame</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Imagen Negra Siguiente</translation>

     </message>

     <message>

         <source>First Frame</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Imagen Inicial</translation>

     </message>

     <message>

         <source>Last Frame</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Imagen Final</translation>

     </message>

     <message>

         <source>Go To Marker A</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Ir a Marcador A</translation>

     </message>

     <message>

         <source>Go To Marker B</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">ir a Marcador B</translation>

     </message>

     <message>

         <source>Go To Time</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Ir a Tiempo</translation>

     </message>

     <message>

         <source>R_esampling (Hz):</source>

@@ -5832,7 +5829,7 @@

     </message>

     <message>

         <source>_Frame rate change:</source>

-        <translation type="unfinished">Cambiar el número de FPS:</translation>

+        <translation type="unfinished">Cambiar el número de _FPS:</translation>

     </message>

     <message>

         <source>No change</source>

@@ -5892,23 +5889,23 @@

     </message>

     <message>

         <source>G_ain value:</source>

-        <translation type="unfinished">Valor de la g_anancia:</translation>

+        <translation type="unfinished">Valor de la G_anancia:</translation>

     </message>

     <message>

         <source>_Mixer:</source>

-        <translation type="unfinished">Mezclador:</translation>

+        <translation type="unfinished">_Mezclador:</translation>

     </message>

     <message>

         <source>Remix:</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Remezcla</translation>

     </message>

     <message>

         <source>Shift audio:</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Desplazar sonido:</translation>

     </message>

     <message>

         <source>Shift Value (ms):</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Valor Desplazamiento (ms)</translation>

     </message>

     <message>

         <source>Audio Filters</source>

@@ -5916,8 +5913,7 @@

     </message>

     <message>

         <source>Fontconfig</source>

-        <translation type="unfinished">

-            </translation>

+        <translation type="unfinished">Fuente</translation>

     </message>

     <message>

         <source>FreeType 2</source>

@@ -5965,7 +5961,7 @@

     </message>

     <message>

         <source>Select Video To Write</source>

-        <translation type="unfinished">Seleccione archivo AVI para escribir</translation>

+        <translation type="unfinished">Seleccione Archivo para Guardar</translation>

     </message>

     <message>

         <source>Save Job</source>

@@ -6033,19 +6029,19 @@

     </message>

     <message>

         <source>Enable openGl support</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Activar soporte openGL</translation>

     </message>

     <message>

         <source>_Split MPEG files every (MB):</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">_Dividir archivos MPEG cada (MB)</translation>

     </message>

     <message>

         <source>VDPAU (best)</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">VDPAU (mejor)</translation>

     </message>

     <message>

         <source>OpenGL (best)</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">OpenGL (mejor)</translation>

     </message>

     <message>

         <source>MS Windows GDI (SDL)</source>

@@ -6061,11 +6057,11 @@

     </message>

     <message>

         <source>No audio track</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Sin pista de sonido</translation>

     </message>

     <message>

         <source>An audio track is necessary to create such file</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Una pista de sonido es necesaria para crear este archivo</translation>

     </message>

     <message>

         <source>Codec Error</source>

@@ -6073,38 +6069,41 @@

     </message>

     <message>

         <source>Cannot select the MPEG-4 SP codec.</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">No se puede seleccionar el codec MPEG-4</translation>

     </message>

     <message>

         <source>No AAC audio encoder plugin found.</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">No se ha encontradio plugin codificador para sonido AAC</translation>

     </message>

     <message>

         <source>The MP3 codec does not allow disabling reservoir.

 Install lame plugin</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">El codec MP3 no permite desactivar reserva

+Instale el plugin lame</translation>

     </message>

     <message>

         <source>You don&apos;t have LAME!.

 It is needed to create FLV  video.</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">¡No tiene LAME!.

+Se necesita para crear videos FLV</translation>

     </message>

     <message>

         <source>Cannot select FLV1  codec.</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">No se puede seleccionar codec FLV1</translation>

     </message>

     <message>

         <source>Cannot select mpeg4 sp codec.</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">No se puede seleccionar codec MPEG-4 SP</translation>

     </message>

     <message>

         <source>You don&apos;t have FAAC!.

 It is needed to create PSP compatible video.</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">¡No tiene FAAC!.

+Se necesita para crear video compatible PSP</translation>

     </message>

     <message>

         <source>Select script to save</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Seleccione script para guardar</translation>

     </message>

     <message>

         <source>Not coded in this version</source>

@@ -6116,7 +6115,7 @@

     </message>

     <message>

         <source>Select AVI File to Append...</source>

-        <translation type="unfinished">Seleccionar archivo AVI para adjuntar...</translation>

+        <translation type="unfinished">Seleccionar archivo AVI para anexar...</translation>

     </message>

     <message>

         <source>Are you sure?</source>

@@ -6162,11 +6161,11 @@

     </message>

     <message>

         <source>Something failed when appending</source>

-        <translation type="unfinished">Ha sucedido algo inesperado</translation>

+        <translation type="unfinished">Algo falló al anexar</translation>

     </message>

     <message>

         <source>Something bad happened (II)</source>

-        <translation type="unfinished">Error no previsto (II)</translation>

+        <translation type="unfinished">Algo imprevisto pasó (II)</translation>

     </message>

     <message>

         <source>Checking video</source>

@@ -6182,7 +6181,7 @@

     </message>

     <message>

         <source>Marker A &gt; B</source>

-        <translation type="unfinished">Marcador A &gt; B</translation>

+        <translation type="unfinished">Marcadordor A &gt; B</translation>

     </message>

     <message>

         <source>Cannot delete the selection.</source>

@@ -6190,7 +6189,7 @@

     </message>

     <message>

         <source>You can&apos;t remove all frames</source>

-        <translation type="unfinished">Imposible borrar todos los frames</translation>

+        <translation type="unfinished">Imposible borrar todas las imágenes</translation>

     </message>

     <message>

         <source>Something bad happened</source>

@@ -6228,40 +6227,39 @@

     </message>

     <message>

         <source>Frame Hex Dump</source>

-        <translation type="unfinished">_Frames por segundo</translation>

+        <translation type="unfinished">Volcado Hex de la Imagen</translation>

     </message>

     <message>

         <source>TimeStamp:</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Marca de Tiempo:</translation>

     </message>

     <message>

         <source>Go to Time</source>

-        <translation type="unfinished">Saltar a _tiempo...</translation>

+        <translation type="unfinished">Saltar a Tiempo</translation>

     </message>

     <message>

         <source>_Filter strength:</source>

-        <translation type="unfinished">Intensidad de Filtrado: </translation>

+        <translation type="unfinished">Intensidad de _Filtrado:</translation>

     </message>

     <message>

         <source>_Swap U and V</source>

-        <translation type="unfinished">Intercambiar U y V</translation>

+        <translation type="unfinished">_Intercambiar U y V</translation>

     </message>

     <message>

         <source>_Deringing</source>

-        <translation type="unfinished">

-            </translation>

+        <translation type="unfinished"></translation>

     </message>

     <message>

         <source>Output file</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Archivo de Salida</translation>

     </message>

     <message>

         <source>Job name</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Nombre de Tarea</translation>

     </message>

     <message>

         <source>Queue job to jobList</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Añadir tarea a la Cola</translation>

     </message>

     <message>

         <source>Select Workbench to Save</source>

@@ -6297,7 +6295,7 @@

     </message>

     <message>

         <source>Fail to save as jpeg</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Fallo al guardar como jpeg</translation>

     </message>

     <message>

         <source>Saving as set of jpegs</source>

@@ -6329,13 +6327,11 @@

     </message>

     <message>

         <source>BMP op failed</source>

-        <translation type="unfinished">

-            </translation>

+        <translation type="unfinished">Op BMP ha fallado</translation>

     </message>

     <message>

         <source>Saving %s as a BMP file failed.</source>

-        <translation type="unfinished">

-            </translation>

+        <translation type="unfinished">Guardar %s como BMP ha fallado.</translation>

     </message>

     <message>

         <source>File %s has been successfully saved.</source>

@@ -6351,11 +6347,11 @@

     </message>

     <message>

         <source>Recent Files</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Archivos Recientes</translation>

     </message>

     <message>

         <source>Recent Projects</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Proyectos Recientes</translation>

     </message>

     <message>

         <source>Custom</source>

@@ -6367,7 +6363,7 @@

     </message>

     <message>

         <source>_New frame rate:</source>

-        <translation type="obsolete">Nuevo frames por segundo</translation>

+        <translation type="obsolete">_Nuevo imágenes por segundo</translation>

     </message>

     <message>

         <source>Resample fps</source>

@@ -6403,27 +6399,27 @@

     </message>

     <message>

         <source>Log</source>

-        <translation type="obsolete">Log</translation>

+        <translation type="obsolete"></translation>

     </message>

     <message>

         <source>Phods</source>

-        <translation type="obsolete">Phods</translation>

+        <translation type="obsolete"></translation>

     </message>

     <message>

         <source>EPZS</source>

-        <translation type="obsolete">EPZS</translation>

+        <translation type="obsolete"></translation>

     </message>

     <message>

         <source>H.263</source>

-        <translation type="obsolete">H.263</translation>

+        <translation type="obsolete"></translation>

     </message>

     <message>

         <source>MPEG</source>

-        <translation type="obsolete">MPEG</translation>

+        <translation type="obsolete"></translation>

     </message>

     <message>

         <source>Advanced Simple Profile</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Perfil Simple Avanzado</translation>

     </message>

     <message>

         <source>Motion Estimation</source>

@@ -6435,11 +6431,11 @@

     </message>

     <message>

         <source>VBR</source>

-        <translation type="obsolete">VBR</translation>

+        <translation type="obsolete"></translation>

     </message>

     <message>

         <source>Quality based</source>

-        <translation type="obsolete">Calidad </translation>

+        <translation type="obsolete">Basado en Calidad </translation>

     </message>

     <message>

         <source>_Bitrate:</source>

@@ -6455,7 +6451,7 @@

     </message>

     <message>

         <source>_Quantizer:</source>

-        <translation type="obsolete">Cuantizador:</translation>

+        <translation type="obsolete">_Cuantizador:</translation>

     </message>

     <message>

         <source>CBR</source>

@@ -6467,7 +6463,7 @@

     </message>

     <message>

         <source>Bit_rate mode:</source>

-        <translation type="obsolete">Modo bitrate:</translation>

+        <translation type="obsolete">Modo bit_rate:</translation>

     </message>

     <message>

         <source>LAME Configuration</source>

@@ -6479,59 +6475,59 @@

     </message>

     <message>

         <source>Partial Start Frame:</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Imagen de Inicio Parcial</translation>

     </message>

     <message>

         <source>Partial End Frame:</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Imagen de Final Parcial</translation>

     </message>

     <message>

         <source>Configure child</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Configurar Pequeño</translation>

     </message>

     <message>

         <source>Partial Video Filter</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Filtro de Video Parcial</translation>

     </message>

     <message>

         <source>_Interlaced</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">_Entrelazado</translation>

     </message>

     <message>

         <source>Ca_rtoon mode</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Modo _Dibujos</translation>

     </message>

     <message>

         <source>_Greyscale</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Escala de _Grises</translation>

     </message>

     <message>

         <source>Turbo mode</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Modo Turbo</translation>

     </message>

     <message>

         <source>C_hroma optimizer</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Optimizar C_roma</translation>

     </message>

     <message>

         <source>Main</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Principal</translation>

     </message>

     <message>

         <source>Very Low</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Muy Bajo</translation>

     </message>

     <message>

         <source>Very High</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Muy Alto</translation>

     </message>

     <message>

         <source>Ultra High</source>

-        <translation type="unfinished"></translation>

+        <translation type="unfinished">Ultra Alto</translation>

     </message>

     <message>

         <source>Motion Search Precision</source>

-        <translation type="unfinished"></translation>