Packman Build Service PMBS

avidemux3.changes Changed

@@ -1,4 +1,28 @@
 -------------------------------------------------------------------
+Thu Mar 30 11:07:43 UTC 2017 - joerg.lorenzen@ki.tng.de
+
+- Update to version 2.6.19
+  + Filter : All filters with preview have better navigation
+    dialogs
+  + Filter : Delogo filter UI redone
+  + Filter : Fixed changeFps/resampleFps seeking
+  + TS/Demux : HEVC support improved
+  + Flv/Demux : Support large files (rcdrone)
+  + Audio : Allow EAC3 as external audio track
+  + UI : General usability cleanup (euma)
+  + UI : Allow using the last read folder as default save folder
+    (euma)
+  + UI : 2 pass encoding dialog cleanup (euma)
+  + UI : Dynamically enable/disable menu (euma)
+  + UI : Customizable keyboard shortcut (euma)
+  + UI : Allow reverting page up/down (euma)
+  + Codec : Better support for 10bits
+  + i18n : Russian translation updated (TotalCaesar659)
+  + i18n : Greek translation updated (nikoss)
+  + i18n : General cleanup (euma)
+  + Updated ffmpeg libs to 3.0.7
+
+-------------------------------------------------------------------
 Sun Jan 08 13:23:21 UTC 2017 - joerg.lorenzen@ki.tng.de
 
 - Update to version 2.6.18

avidemux3.spec Changed

@@ -16,7 +16,7 @@
 #
 
 
-%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315
+%if 0%{?suse_version} > 1320 || 0%{?sle_version}
 %bcond_without  build_qt5
 %define         qtversion 5
 %else
@@ -24,14 +24,19 @@
 %define         qtversion 4
 %endif
 
+%if 0%{?suse_version} > 1320 || 0%{?sle_version} > 120100
+%bcond_without  with_vs
+%endif
+
 Name:           avidemux3
 Summary:        Graphical video editing and transcoding tool
-Version:        2.6.18
+Version:        2.6.19
 Release:        1
 Url:            http://avidemux.sourceforge.net/
 Source0:        avidemux_%{version}.tar.gz
 Source1:        avidemux3-qt.desktop
-Source2:        config.mak.diff
+Source2:        avidemux3-vsproxy-qt.desktop
+Source3:        config.mak.diff
 Patch0:         avidemux-cmake-2.8.8.patch
 Patch1:         avidemux-linking.patch
 Patch2:         avidemux-x264_plugins.patch
@@ -52,6 +57,10 @@
 BuildRequires:  fdupes
 BuildRequires:  dos2unix
 BuildRequires:  yasm
+%if %{with with_vs}
+BuildRequires:  pkgconfig(vapoursynth)
+BuildRequires:  libvapoursynth-script
+%endif
 BuildRequires:  pkgconfig(fribidi)
 BuildRequires:  pkgconfig(libxslt)
 BuildRequires:  pkgconfig(libxml-2.0)
@@ -88,6 +97,7 @@
 BuildRequires:  pkgconfig(vorbis)
 BuildRequires:  pkgconfig(libdca)
 BuildRequires:  pkgconfig(opencore-amrnb)
+BuildRequires:  pkgconfig(opus)
 BuildRequires:  pkgconfig(vpx)
 BuildRequires:  pkgconfig(twolame)
 BuildRequires:  pkgconfig(dcaenc)
@@ -198,7 +208,7 @@
 %patch5 -p0
 %patch6 -p0
 %patch7 -p0
-cp -f %{S:2} avidemux_core/ffmpeg_package/patches/
+cp -f %{S:3} avidemux_core/ffmpeg_package/patches/
 chmod 755 bootStrap.bash
 chmod 644 AUTHORS COPYING README
 
@@ -213,9 +223,9 @@
 
 options+="--with-cli "
 %if %{with build_qt5}
-options+="--with-qt4 "
+options+="--with-qt "
 %else
-options+="--with-qt4 --enable-qt4 "
+options+="--with-qt --enable-qt4 "
 %endif
 ./bootStrap.bash $options
 
@@ -225,6 +235,10 @@
 # Install desktop file
 install -D -m644 %{S:1} %{buildroot}%{_datadir}/applications/avidemux3-qt%{qtversion}.desktop
 sed -i -e 's|qtversion|%{qtversion}|g' %{buildroot}%{_datadir}/applications/avidemux3-qt%{qtversion}.desktop
+%if %{with with_vs}
+install -D -m644 %{S:2} %{buildroot}%{_datadir}/applications/vsproxy-qt%{qtversion}.desktop
+sed -i -e 's|qtversion|%{qtversion}|g' %{buildroot}%{_datadir}/applications/vsproxy-qt%{qtversion}.desktop
+%endif
 
 # Install icon
 install -D -m644 avidemux_icon.png %{buildroot}%{_datadir}/pixmaps/avidemux3.png
@@ -255,6 +269,9 @@
 
 %files
 %defattr(-,root,root)
+%if %{with with_vs}
+%{_bindir}/vsProxy
+%endif
 %{_libdir}/libADM6avcodec.so.*
 %{_libdir}/libADM6avformat.so.*
 %{_libdir}/libADM6avutil.so.*
@@ -307,6 +324,7 @@
 %{_libdir}/ADM_plugins6/audioDecoder/libADM_ad_ms_adpcm.so
 %{_libdir}/ADM_plugins6/audioDecoder/libADM_ad_opencore_amrnb.so
 %{_libdir}/ADM_plugins6/audioDecoder/libADM_ad_opencore_amrwb.so
+%{_libdir}/ADM_plugins6/audioDecoder/libADM_ad_opus.so
 %{_libdir}/ADM_plugins6/audioDecoder/libADM_ad_ulaw.so
 %{_libdir}/ADM_plugins6/audioDecoder/libADM_ad_vorbis.so
 %{_libdir}/ADM_plugins6/audioDevices/libADM_av_alsaDefault.so
@@ -376,7 +394,6 @@
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_avsfilter.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_addBorders.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_black.so
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_blackenBorders.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_changeFps.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_colorYuv.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_denoise3d.so
@@ -397,7 +414,6 @@
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_mean.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_median.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_mergeField.so
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_msharpen.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_printInfo.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_removePlane.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_resampleFps.so
@@ -431,6 +447,7 @@
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_x264_cli.so
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_x265_cli.so
 %dir %{_libdir}/ADM_plugins6/videoFilters/cli
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_blackenBordersCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_chromaShiftCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_contrastCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_CropCli.so
@@ -438,12 +455,16 @@
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_HueCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_logoCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_mpdelogoCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_msharpenCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_swscaleResize_cli.so
 
 %files qt%{qtversion}
 %defattr(-,root,root)
 %{_bindir}/avidemux3_jobs_qt%{qtversion}
 %{_bindir}/avidemux3_qt%{qtversion}
+%if %{with with_vs}
+%{_bindir}/vsProxy_gui_qt%{qtversion}
+%endif
 %{_libdir}/libADM_openGLQT%{qtversion}6.so
 %{_libdir}/libADM_render6_QT%{qtversion}.so
 %{_libdir}/libADM_UIQT%{qtversion}6.so
@@ -458,6 +479,7 @@
 %{_libdir}/ADM_plugins6/videoEncoders/qt%{qtversion}/libADM_ve_x264_QT%{qtversion}.so
 %{_libdir}/ADM_plugins6/videoEncoders/qt%{qtversion}/libADM_ve_x265_QT%{qtversion}.so
 %{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_asharpQT%{qtversion}.so
+%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_blackenBordersQT%{qtversion}.so
 %{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_chromaShiftQT%{qtversion}.so
 %{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_contrastQT%{qtversion}.so
 %{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_cropQT%{qtversion}.so
@@ -467,12 +489,16 @@
 %{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_HueQT%{qtversion}.so
 %{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_logoQT%{qtversion}.so
 %{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_mpdelogoQT%{qtversion}.so
+%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_msharpenQT%{qtversion}.so
 %{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_rotateGlFrag2.so
 %{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_sampleGlFrag2.so
 %{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_sampleGlVertex.so
 %{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_shaderLoaderGl.so
 %{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_swscaleResizeQT%{qtversion}.so
 %{_datadir}/applications/avidemux3-qt%{qtversion}.desktop
+%if %{with with_vs}
+%{_datadir}/applications/vsproxy-qt%{qtversion}.desktop
+%endif
 %{_datadir}/pixmaps/avidemux3.png
 
 %files qt%{qtversion}-lang

avidemux3-vsproxy-qt.desktop Added

avidemux_2.6.18.tar.gz/avidemux_core/ffmpeg_package/ffmpeg-3.0.5.tar.bz2 Deleted

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shader1.shader Deleted

avidemux_2.6.19.tar.gz/addons/dumpIndex Added

avidemux_2.6.19.tar.gz/addons/dumpIndex/ADM_indexFile.cpp Added

@@ -0,0 +1,280 @@
+/**
+    \file ADM_indexFile
+    \brief Handle index file reading
+    copyright            : (C) 2009 by mean
+    email                : fixounet@free.fr
+        
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#include "ADM_default.h"
+#include "ADM_indexFile.h"
+#include "ctype.h"
+/**
+
+*/
+dmxToken::dmxToken(const char *name,const char *value)
+{
+    this->name=ADM_strdup(name);
+    this->value=ADM_strdup(value);
+}
+/**
+
+*/
+dmxToken::~dmxToken()
+{
+    if(name) ADM_dealloc(name);
+    if(value) ADM_dealloc(value);
+}
+
+char *dmxToken::getName(void) {return name;}
+char *dmxToken::getValue(void){return value;}
+/**
+
+*/
+bool  dmxToken::isNumeric(void)
+{
+bool num=true;
+int l=strlen(value);
+    for(int i=0;i<l;i++)
+    {
+        char v=value[i];
+        if(!isdigit(v)&& v!=0x0a && v!=0x0d) num=false;
+    }
+    return num;
+}   
+/**
+
+*/
+uint32_t dmxToken::getAsNumber(void)
+{
+uint32_t v;
+    v=atoi(value);
+    return v;
+}
+/**
+
+*/
+uint64_t dmxToken::getAsNumber64(void)
+{
+uint64_t v;
+    sscanf(value,"%" PRId64,&v);
+    return v;
+}
+
+//****************************************************************************************
+
+/**
+
+*/
+
+indexFile::indexFile()
+{
+    file=NULL;
+    buffer.setSize(ADM_INDEX_BUFFER);
+}
+/**
+
+*/
+
+indexFile::~indexFile()
+{
+   close();
+}
+/**
+
+*/
+void  indexFile::purgeTokens(void)
+{
+    int nb=ListOfTokens.size();
+    for(int i=0;i<nb;i++)
+        delete ListOfTokens[i];
+    ListOfTokens.clear();
+}
+/**
+
+*/
+dmxToken        *indexFile::searchToken(const char *name)
+{
+    for(int i=0;i<ListOfTokens.size();i++)
+    {
+        dmxToken *tk=ListOfTokens[i];
+        if(!strcasecmp(name,tk->getName())) return tk;
+    }
+    printf("[indexFile] Token %s not found\n",name);
+    for(int i=0;i<ListOfTokens.size();i++)
+        printf("  [%d]%s\n",i,ListOfTokens[i]->getName());
+    return NULL;
+}
+/**
+
+*/
+
+bool indexFile::open(const char *name)
+{
+    file=ADM_fopen(name,"rt");
+    if(!file) return false;
+    return true;
+}
+
+/**
+
+*/
+
+bool indexFile::close(void)
+{
+    if(file)
+    {
+        fclose(file);
+        file=NULL;
+    }
+    purgeTokens();
+    return true;
+}
+
+/**
+
+*/
+
+bool indexFile::goToSection(const char *section)
+{
+char match[100];
+    sprintf(match,"[%s]\n",section);
+    fseek(file,0,SEEK_SET);
+    while(1)
+    {
+        if(!fgets((char*)buffer.at(0),ADM_INDEX_BUFFER,file) )
+        {
+            printf("[indexFile] Cannot find section %s,%s*\n",section,match);
+            return false;
+        }
+        if(!strcasecmp((char*)buffer.at(0),match)) return true;
+    }
+    return false;
+}
+
+/**
+    \fn readSection
+*/
+
+bool indexFile::readSection(const char *section)
+{
+    if(false==goToSection(section)) return false;
+    // Until we reach the next section, store all couples name/value into the
+    //
+    while(1)
+    {
+        if(!readString(ADM_INDEX_BUFFER,buffer.at(0))) break;
+        if(buffer[0]=='[') break; // end of section
+        // Now search the = and replace it by a zero
+        char *head,*tail;
+        head=(char *)buffer.at(0);
+        tail=(char *)buffer.at(0);
+        tail=strstr((char *)buffer.at(0),"=");
+        if(!tail) 
+        {
+            if(buffer[0]=='#') // Comment
+            {
+
+            }else   
+            {
+                printf("[psIndexer]Weird line :%s\n",buffer.at(0));
+                break;
+            }
+        }else
+        {
+            *tail=0;
+            tail++;
+            dmxToken *tk=new dmxToken(head,tail);
+            ListOfTokens.append(tk);
+        }
+    }
+    return true;

avidemux_2.6.19.tar.gz/addons/dumpIndex/ADM_indexFile.h Added

@@ -0,0 +1,79 @@
+/**
+    \file ADM_indexFile
+    \brief Handle index file reading
+    copyright            : (C) 2009 by mean
+    email                : fixounet@free.fr
+        
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef ADM_INDEXFILE_H
+#define ADM_INDEXFILE_H
+#include "ADM_coreDemuxerMpeg6_export.h"
+#include <BVector.h>
+#include "ADM_byteBuffer.h"
+/**
+    \class indexFile
+    \brief Read a index file easily
+*/
+#define ADM_INDEX_FILE_VERSION 5
+#define ADM_INDEX_BUFFER (20*1024)
+/**
+    \class dmxToken
+*/
+class ADM_COREDEMUXER6_EXPORT dmxToken
+{
+protected:
+    char *name;
+    char *value;
+    FILE *file;
+    void  purgeTokens(void);
+public:
+    
+    dmxToken(const char *name,const char *value);
+    ~dmxToken();
+    char *getName(void);
+    char *getValue(void);
+    bool  isNumeric(void);
+    uint32_t getAsNumber(void);
+    uint64_t getAsNumber64(void);
+};
+
+/**
+    \class indexFile
+*/
+
+class ADM_COREDEMUXER6_EXPORT indexFile
+{
+protected:
+    ADM_byteBuffer buffer;
+    dmxToken        *searchToken(const char *name);
+    void            purgeTokens(void);
+
+    FILE            *file;
+    BVector         <dmxToken *> ListOfTokens;
+public:
+
+        indexFile();
+        ~indexFile();
+    bool open(const char *name);
+    bool close(void);
+    bool goToSection(const char *section);
+    bool readSection(const char *section);
+    uint64_t getAsUint64(const char *token);
+    uint32_t getAsUint32(const char *token);
+    uint32_t getAsHex(const char *token);
+    char *getAsString(const char *token);
+    bool  readString(uint32_t maxLen,uint8_t *buffer);
+
+};
+
+#endif

avidemux_2.6.19.tar.gz/addons/dumpIndex/ADM_ts.h Added

avidemux_2.6.19.tar.gz/addons/dumpIndex/ADM_tsReadIndex.cpp Added

@@ -0,0 +1,190 @@
+/***************************************************************************
+        \file ADM_tsReadIndex.cpp
+        \brief Read ts index
+
+    copyright            : (C) 2007/2009 by mean
+
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#include <vector>
+#include <string>
+using std::vector;
+using std::string;
+
+#include "ADM_default.h"
+#include "fourcc.h"
+#include "DIA_coreToolkit.h"
+#include "ADM_indexFile.h"
+#include "ADM_string.h"
+#include "ADM_vidMisc.h"
+
+#include <math.h>
+#define TS_MAX_LINE 10000
+#include "ADM_ts.h"
+
+extern uint8_t  mk_hex(uint8_t a, uint8_t b);;
+/**
+        \fn readIndex
+        \brief Read the [video] section of the index file
+
+*/
+bool    tsHeader::readIndex(indexFile *index)
+{
+char buffer[TS_MAX_LINE];
+bool firstAudio=true;
+        printf("[TsDemuxerer] Reading index\n");
+        if(!index->goToSection("Data")) return false;
+      
+        while(1)
+        {
+            if(!index->readString(TS_MAX_LINE,(uint8_t *)buffer)) return true;
+            if(buffer[0]=='[') return true;
+            if(buffer[0]==0xa || buffer[0]==0xd) continue; // blank line
+            // Now split the line
+            if(!strncmp(buffer,"Video ",6))
+            {
+                processVideoIndex(buffer+6);
+            }
+            if(!strncmp(buffer,"Audio ",6))
+            {
+                if(firstAudio) 
+                    firstAudio=false; // Ignore first line
+            }
+        }
+    return true;
+}
+
+/**
+    \fn processVideoIndex
+    \brief process an mpeg index entry from a line from the index file
+*/
+bool tsHeader::processVideoIndex(char *buffer)
+{
+            char *head=buffer;
+            uint64_t pts,dts,startAt;
+            uint32_t offset;
+            if(4!=sscanf(head,"at:%" PRIx64":%" PRIx32" Pts:%" PRId64":%" PRId64,&startAt,&offset,&pts,&dts))
+            {
+                    printf("[TsDemuxerer] cannot read fields in  :%s\n",buffer);
+                    return false;
+            }
+            
+            char *start=strstr(buffer," I");
+            if(!start) start=strstr(buffer," D");
+            if(!start) return true;
+            start+=1;
+            int count=0;
+            uint64_t lastDts=ADM_NO_PTS;
+            while(1)
+            {
+                char *cur=start;
+                char type=1;
+                char picStruct='F';
+                char *next;
+                uint32_t len;
+                type=*cur;
+                if(type==0x0a || type==0x0d || !type) break;
+                cur++;
+                picStruct=*cur;
+                cur++;
+                if(*(cur)!=':')
+                {
+                    printf("[TsDemuxer]  instead of : (%c %x %x):\n",*cur,*(cur-1),*cur);
+                }
+                cur++;
+                next=strstr(start," ");
+                int64_t ppts,ddts;
+                ADM_assert(3==sscanf(cur,"%" PRIx32":%" PRId64":%" PRId64,&len,&ppts,&ddts));
+                
+                
+                dmxFrame *frame=new dmxFrame;
+                if(!count)
+                {
+                    frame->pts=pts;
+                    frame->dts=dts;
+
+                    frame->startAt=startAt;
+                    frame->index=offset;
+
+                }else       
+                {
+                    if(ppts==-1 || pts==-1)
+                        frame->pts=ADM_NO_PTS;
+                    else
+                        frame->pts=pts+ppts;
+                    if(ddts==-1 || dts==-1)
+                        frame->dts=ADM_NO_PTS;
+                    else
+                        frame->dts=dts+ddts;
+
+                    frame->startAt=0;
+                    frame->index=0;
+                }
+                switch(type)
+                {
+                    case 'I': frame->type=1;break;
+                    case 'P': frame->type=2;break;
+                    case 'B': frame->type=3;break;
+                    case 'D': frame->type=4;break;
+                    default: ADM_assert(0);
+                }
+                switch(picStruct)
+                {
+                        default: ADM_warning("Unknown picture structure %c\n",picStruct);
+                        case 'F': ;break;
+                        case 'T': ;break;
+                        case 'B': ;break;
+
+                }
+                frame->len=len;
+                
+                printf("Frame %c len = %6d dts = %s ",type,len,ADM_us2plain(frame->dts));
+                printf(" pts = %s  ",ADM_us2plain(frame->pts));
+                if(lastDts!=ADM_NO_PTS && frame->dts!=ADM_NO_PTS)
+                {
+                    printf("delta dts=%d",(int)(frame->dts-lastDts));
+                }
+                printf("\n");
+                lastDts=frame->dts;
+                
+                count++;
+                if(!next) 
+                {
+                    break;
+                }
+                start=next+1;
+            }
+
+        return true;
+}
+
+/**
+        \fn readVideo
+        \brief Read the [video] section of the index file
+
+*/
+
+bool    tsHeader::readVideo(indexFile *index)
+{
+    printf("[TsDemuxerer] Reading Video\n");
+    if(!index->readSection("Video")) return false;
+    uint32_t w,h,fps,ar;
+    
+    w=index->getAsUint32("Width");
+    h=index->getAsUint32("height");
+    fps=index->getAsUint32("Fps");
+    char *type=index->getAsString("VideoCodec");
+
+
+
+    return true;
+}
+//EOF

avidemux_2.6.19.tar.gz/addons/dumpIndex/CMakeLists.txt Added

@@ -0,0 +1,45 @@
+SET(ADM_PROJECT tsDump)
+#
+SET(CMAKE_INSTALL_PREFIX /usr)
+SET(AVIDEMUX_SOURCE_DIR ${CMAKE_SOURCE_DIR}/../..)
+#
+
+MESSAGE(STATUS "Checking for AVIDEMUX_SOURCE_DIR, AVIDEMUX_LIB_DIR, AVIDEMUX_INCLUDE_DIR...")
+IF (NOT AVIDEMUX_SOURCE_DIR)
+	MESSAGE(FATAL_ERROR "Please add -DAVIDEMUX_SOURCE_DIR=path_to_avidemux_source. You just need the source tree.")
+ELSE (NOT AVIDEMUX_TOP_SOURCE_DIR)
+        # We need TOP_SOURCE_DIR 
+	SET(AVIDEMUX_TOP_SOURCE_DIR "${AVIDEMUX_SOURCE_DIR}" CACHE STRING "")
+ENDIF (NOT AVIDEMUX_SOURCE_DIR)
+
+
+# Common definitions...
+SET(CMAKE_MODULE_PATH "${AVIDEMUX_TOP_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
+include(${AVIDEMUX_TOP_SOURCE_DIR}/cmake/commonCmakeApplication.cmake)
+include(${AVIDEMUX_TOP_SOURCE_DIR}/cmake/admAsNeeded.cmake)
+########################################
+# Add include dirs
+########################################
+SET(AVIDEMUX_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}")
+MARK_AS_ADVANCED(AVIDEMUX_INSTALL_DIR)
+include(admInstallDir)
+#########################################
+# Get regular stuff from main app
+#########################################
+include(admCoreIncludes)
+LINK_DIRECTORIES("${AVIDEMUX_LIB_DIR}")
+INCLUDE_DIRECTORIES(${AVIDEMUX_INCLUDE_DIR}/avidemux/2.6/)
+
+IF (FRESH_BUILD)
+	MESSAGE("")
+ENDIF (FRESH_BUILD)
+
+
+SET(SRCS 
+        main.cpp
+        ADM_indexFile.cpp
+        ADM_tsReadIndex.cpp
+        )
+
+ADD_EXECUTABLE(dumpIndex ${SRCS})
+TARGET_LINK_LIBRARIES(dumpIndex ADM_core6)

avidemux_2.6.19.tar.gz/addons/dumpIndex/main.cpp Added

avidemux_2.6.19.tar.gz/autononreg/py/editor/pyNextFrame.py Added

avidemux_2.6.18.tar.gz/avidemux/cli/ADM_userInterfaces/ADM_gui2/gui_none.cpp -> avidemux_2.6.19.tar.gz/avidemux/cli/ADM_userInterfaces/ADM_gui2/gui_none.cpp Changed

avidemux_2.6.18.tar.gz/avidemux/common/ADM_commonUI/DIA_prefs.cpp -> avidemux_2.6.19.tar.gz/avidemux/common/ADM_commonUI/DIA_prefs.cpp Changed

@@ -64,6 +64,9 @@
 char     *alsaDevice=NULL;
 
 bool     balternate_mp3_tag=true;
+bool     lastReadDirAsTarget=false;
+bool     altKeyboardShortcuts=false;
+bool     swapUpDown=false;
 
 uint32_t pp_type=3;
 uint32_t pp_value=5;
@@ -162,6 +165,15 @@
 
         prefs->get(RESET_ENCODER_ON_VIDEO_LOAD,&loadDefault);
 
+        // Make users happy who prefer the output dir to be the same as the input dir
+        prefs->get(FEATURES_USE_LAST_READ_DIR_AS_TARGET,&lastReadDirAsTarget);
+
+        // PgUp and PgDown are cumbersome to reach on some laptops, offer alternative kbd shortcuts
+        prefs->get(KEYBOARD_SHORTCUTS_USE_ALTERNATE_KBD_SHORTCUTS,&altKeyboardShortcuts);
+
+        // Optionally reverse UP and DOWN keys for navigation
+        prefs->get(KEYBOARD_SHORTCUTS_SWAP_UP_DOWN_KEYS,&swapUpDown);
+
         // Multithreads
         prefs->get(FEATURES_THREADING_LAVC, &lavcThreads);
 
@@ -215,6 +227,8 @@
         diaElemToggle allowAnyMpeg(&mpeg_no_limit,QT_TRANSLATE_NOOP("adm","_Accept non-standard audio frequency for DVD"));
         diaElemToggle openDml(&use_odml,QT_TRANSLATE_NOOP("adm","Create _OpenDML files"));
         diaElemToggle resetEncoder(&loadDefault,QT_TRANSLATE_NOOP("adm","_Revert to saved default output settings on video load"));
+        diaElemToggle enableAltShortcuts(&altKeyboardShortcuts,QT_TRANSLATE_NOOP("adm","_Enable alternative keyboard shortcuts"));
+        diaElemToggle swapUpDownKeys(&swapUpDown,QT_TRANSLATE_NOOP("adm","Re_verse UP and DOWN arrow keys for navigation"));
         diaElemToggle checkForUpdate(&doAutoUpdate,QT_TRANSLATE_NOOP("adm","_Check for new release"));
 
 
@@ -274,6 +288,8 @@
 
         diaElemToggle   togTagMp3(&balternate_mp3_tag,QT_TRANSLATE_NOOP("adm","_Use alternative tag for MP3 in .mp4"));
 
+        diaElemToggle useLastReadAsTarget(&lastReadDirAsTarget,QT_TRANSLATE_NOOP("adm","_Default to the directory of the last read file for saving"));
+
         diaMenuEntry videoMode[]={
                              {RENDER_GTK, getNativeRendererDesc(0), NULL}
 #ifdef USE_XV
@@ -416,15 +432,15 @@
 
 
         /* User Interface */
-        diaElem *diaUser[]={&menuMessage,&menuLanguage,&resetEncoder,&checkForUpdate};
-        diaElemTabs tabUser(QT_TRANSLATE_NOOP("adm","User Interface"),4,diaUser);
+        diaElem *diaUser[]={&menuMessage,&menuLanguage,&resetEncoder,&enableAltShortcuts,&swapUpDownKeys,&checkForUpdate};
+        diaElemTabs tabUser(QT_TRANSLATE_NOOP("adm","User Interface"),6,diaUser);
 
          /* Automation */
 
 
         /* Output */
-        diaElem *diaOutput[]={&autoSplit,&openDml,&allowAnyMpeg,&togTagMp3};
-        diaElemTabs tabOutput(QT_TRANSLATE_NOOP("adm","Output"),4,(diaElem **)diaOutput);
+        diaElem *diaOutput[]={&autoSplit,&openDml,&allowAnyMpeg,&togTagMp3,&useLastReadAsTarget};
+        diaElemTabs tabOutput(QT_TRANSLATE_NOOP("adm","Output"),5,(diaElem **)diaOutput);
 
         /* Audio */
 
@@ -609,6 +625,12 @@
             prefs->set(FEATURES_LIBVA,blibva);
             // Alternate mp3 tag (haali)
             prefs->set(FEATURES_ALTERNATE_MP3_TAG,balternate_mp3_tag);
+            // Make users happy who prefer the output dir to be the same as the input dir
+            prefs->set(FEATURES_USE_LAST_READ_DIR_AS_TARGET,lastReadDirAsTarget);
+            // Enable alternate keyboard shortcuts
+            prefs->set(KEYBOARD_SHORTCUTS_USE_ALTERNATE_KBD_SHORTCUTS,altKeyboardShortcuts);
+            // Allow to use the UP key to navigate back, DOWN to navigate forward
+            prefs->set(KEYBOARD_SHORTCUTS_SWAP_UP_DOWN_KEYS,swapUpDown);
 
             prefs->set(DEFAULT_LANGUAGE,std::string(myLanguages[languageIndex].lang));

avidemux_2.6.18.tar.gz/avidemux/common/ADM_commonUI/GUI_ui.h -> avidemux_2.6.19.tar.gz/avidemux/common/ADM_commonUI/GUI_ui.h Changed

avidemux_2.6.18.tar.gz/avidemux/common/ADM_commonUI/myOwnMenu.h -> avidemux_2.6.19.tar.gz/avidemux/common/ADM_commonUI/myOwnMenu.h Changed

@@ -60,6 +60,7 @@
             {MENU_SEPARATOR,"-",NULL,ACT_DUMMY             ,NULL,       NULL},
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Set Marker A"),       NULL,ACT_MarkA      ,NULL,"Ctrl+PgUp"},
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Set Marker B"),       NULL,ACT_MarkB      ,NULL,"Ctrl+PgDown"},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Reset Markers"),      NULL,ACT_ResetMarkers,NULL,"Ctrl+Home"},
             {MENU_SEPARATOR,"-",NULL,ACT_DUMMY             ,NULL,       NULL},
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Pr&eferences"),       NULL,ACT_PREFERENCES,NULL,NULL},
             {MENU_SEPARATOR,"-",NULL,ACT_DUMMY             ,NULL,NULL},
@@ -103,8 +104,8 @@
 
 static const MenuEntry _myMenuGo[] = {
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Play/Stop"),           NULL,ACT_PlayAvi        ,MKICON(player_play),   "Space"},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Previous Frame"),      NULL,ACT_PreviousFrame  ,MKICON(previous),      "Left"},
-            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Next Frame"),          NULL,ACT_NextFrame      ,MKICON(next),          "Right"},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Previous Frame"),      NULL,ACT_PreviousFrame  ,MKICON(back),          "Left"},
+            {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Next Frame"),          NULL,ACT_NextFrame      ,MKICON(forward),       "Right"},
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Previous Intra Frame"),NULL,ACT_PreviousKFrame ,MKICON(player_rew),    "Down"},
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Next Intra Frame"),    NULL,ACT_NextKFrame     ,MKICON(player_fwd),    "Up"},
             {MENU_ACTION,QT_TRANSLATE_NOOP("adm","Previous Black Frame"),NULL,ACT_PrevBlackFrame ,MKICON(prev_black),    NULL},

avidemux_2.6.18.tar.gz/avidemux/common/ADM_editor/include/ADM_edit.hxx -> avidemux_2.6.19.tar.gz/avidemux/common/ADM_editor/include/ADM_edit.hxx Changed

@@ -196,6 +196,7 @@
                     bool        copyToClipBoard(uint64_t startTime, uint64_t endTime);
                     bool        pasteFromClipBoard(uint64_t currentTime);
                     bool        appendFromClipBoard(void);
+                    bool        clipboardEmpty(void);
                     bool     	addFile (const char *name);
 					int         appendFile(const char *name);
 					void		closeFile(void);
@@ -226,11 +227,15 @@
 
 protected:
                     ListOfUndoQueueElements undoQueue;
+                    static const uint8_t maxUndoSteps=50;
+                    uint32_t    _cnt; // track the nb of performed undo steps for redo
 public:
                     bool        addToUndoQueue(void);
                     bool        undo(void);
                     bool        redo(void);
                     bool        clearUndoQueue(void);
+                    bool        canUndo(void);
+                    bool        canRedo(void);
 /************************************ Public API ***************************/
 public:
                     uint64_t    getLastKeyFramePts(void);

avidemux_2.6.18.tar.gz/avidemux/common/ADM_editor/include/ADM_segment.h -> avidemux_2.6.19.tar.gz/avidemux/common/ADM_editor/include/ADM_segment.h Changed

avidemux_2.6.18.tar.gz/avidemux/common/ADM_editor/include/IEditor.h -> avidemux_2.6.19.tar.gz/avidemux/common/ADM_editor/include/IEditor.h Changed

@@ -1,5 +1,18 @@
-#ifndef IEditor_h
-#define IEditor_h
+/***************************************************************************
+     \file  IEditor.h
+     \brief Editor Interface class
+   
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#pragma once
 
 #include "ADM_Video.h"
 #include "ADM_image.h"
@@ -107,4 +120,3 @@
     virtual const char *getVar(const char *key)=0;
     virtual bool  printEnv(void)=0;
 };
-#endif

avidemux_2.6.18.tar.gz/avidemux/common/ADM_editor/src/ADM_edit.cpp -> avidemux_2.6.19.tar.gz/avidemux/common/ADM_editor/src/ADM_edit.cpp Changed

avidemux_2.6.18.tar.gz/avidemux/common/ADM_editor/src/ADM_segment.cpp -> avidemux_2.6.19.tar.gz/avidemux/common/ADM_editor/src/ADM_segment.cpp Changed

avidemux_2.6.18.tar.gz/avidemux/common/ADM_editor/src/audio/ADM_edAudioPcm.cpp -> avidemux_2.6.19.tar.gz/avidemux/common/ADM_editor/src/audio/ADM_edAudioPcm.cpp Changed

avidemux_2.6.18.tar.gz/avidemux/common/ADM_editor/src/audio/ADM_edAudioTrackExternal.cpp -> avidemux_2.6.19.tar.gz/avidemux/common/ADM_editor/src/audio/ADM_edAudioTrackExternal.cpp Changed

avidemux_2.6.18.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_edUndoQueue.cpp -> avidemux_2.6.19.tar.gz/avidemux/common/ADM_editor/src/utils/ADM_edUndoQueue.cpp Changed

@@ -17,9 +17,6 @@
 #include "ADM_segment.h"
 #include "ADM_edit.hxx"
 
-static const uint8_t maxUndoSteps=50;
-uint32_t _cnt; // track the nb of performed undo steps for redo
-
 /**
     \fn addToUndoQueue
     \brief stores the segment layout and markers in the undo queue
@@ -66,7 +63,7 @@
 
 bool ADM_Composer::undo(void)
 {
-    if(undoQueue.empty() || undoQueue.size()<_cnt+1)
+    if(!canUndo())
     {
         ADM_info("The undo queue is empty, nothing to do\n");
         return false;
@@ -94,7 +91,7 @@
 
 bool ADM_Composer::redo(void)
 {
-    if(_cnt<2 || undoQueue.size()<_cnt) // _cnt=2 once the first undo operation has been performed
+    if(!canRedo())
     {
         ADM_info("The redo queue is empty, cannot perform redo\n");
         return false;
@@ -117,4 +114,26 @@
     undoQueue.clear();
     return true;
 }
+
+/**
+    \fn canUndo
+*/
+
+bool ADM_Composer::canUndo(void)
+{
+    if(undoQueue.empty() || undoQueue.size()<_cnt+1)
+        return false;
+    return true;
+}
+
+/**
+    \fn canRedo
+*/
+
+bool ADM_Composer::canRedo(void)
+{
+    if(_cnt<2 || undoQueue.size()<_cnt) // _cnt=2 once the first undo operation has been performed
+        return false;
+    return true;
+}
 //EOF

avidemux_2.6.18.tar.gz/avidemux/common/ADM_muxerGate/include/ADM_videoCopy.h -> avidemux_2.6.19.tar.gz/avidemux/common/ADM_muxerGate/include/ADM_videoCopy.h Changed

@@ -44,6 +44,7 @@
         ADMBitstream    *myBitstream;
         uint8_t         *myExtra;
         uint32_t        myExtraLen;
+        bool            _init;
         bool            compactNalus(ADMBitstream *out);
         int             convertFromAnnexB(uint8_t *inData,uint32_t inSize,
                                                       uint8_t *outData,uint32_t outMaxSize);
@@ -53,6 +54,10 @@
         virtual         ~ADM_videoStreamCopyFromAnnexB();
         virtual bool    getPacket(ADMBitstream *out);
         virtual bool    getExtraData(uint32_t *extraLen, uint8_t **extraData) ;
+        bool            initOk() {return _init;}
+protected:
+        bool            extractExtraDataH264();
+        bool            extractExtraDataH265();
 };
 /**
         \fn ADM_videoStreamCopyToAnnexB
@@ -74,5 +79,8 @@
         virtual         ~ADM_videoStreamCopyToAnnexB();
         virtual bool    getPacket(ADMBitstream *out);
         virtual bool    getExtraData(uint32_t *extraLen, uint8_t **extraData) ;
+protected:
+        bool extractExtraDataH264();
+        bool extractExtraDataH265();
 };
 #endif

avidemux_2.6.18.tar.gz/avidemux/common/ADM_muxerGate/src/ADM_videoCopyFromAnnexB.cpp -> avidemux_2.6.19.tar.gz/avidemux/common/ADM_muxerGate/src/ADM_videoCopyFromAnnexB.cpp Changed

@@ -25,7 +25,7 @@
 {
     #include "libavcodec/avcodec.h"
 }
-
+#include "ADM_h265_tag.h"
 extern ADM_Composer *video_body; // Fixme!
 
 //#warning fixme : double definition
@@ -67,15 +67,11 @@
     if(nal<=12) ADM_info("Nal : %s",nalType[nal]);
     return true;
 }
-
-
 /**
-    \fn ctor
-*/
-ADM_videoStreamCopyFromAnnexB::ADM_videoStreamCopyFromAnnexB(uint64_t startTime,uint64_t endTime):
-      ADM_videoStreamCopy(startTime,endTime)  
+ * \fn extractExtraDataH264
+ */
+bool ADM_videoStreamCopyFromAnnexB::extractExtraDataH264()
 {
-    ADM_info("AnnexB to iso filter\n");
     myBitstream=new ADMBitstream(ADM_COPY_FROM_ANNEX_B_SIZE);
     myBitstream->data=buffer;
 
@@ -89,78 +85,224 @@
     ADMCompressedImage img;
     img.data=buffer;
     img.dataLength=0;
-
-    if(true==video_body->getDirectImageForDebug(0,&img))
+    if(false==video_body->getDirectImageForDebug(0,&img))
     {
-        myBitstream->len=img.dataLength;
-        NALU_descriptor desc[MAX_NALU_PER_CHUNK];
-        //mixDump(img.data,img.dataLength);
-        int nbNalu=ADM_splitNalu(myBitstream->data,myBitstream->data+myBitstream->len,
-                                MAX_NALU_PER_CHUNK,desc);
-        // search sps
-        uint8_t *spsStart,*ppsStart;
-        uint32_t spsLen=0, ppsLen=0;
-        int indexSps,indexPps;
-
-        indexSps=ADM_findNalu(NAL_SPS,nbNalu,desc);
-        if(-1==indexSps)
-        {
-            ADM_error("Cannot find SPS");
-        }
-        indexPps=ADM_findNalu(NAL_PPS,nbNalu,desc);
-        if(-1==indexPps)
-        {
-            ADM_error("Cannot find SPS");
-        }else
-        {
-            int count=desc[indexPps].size;
-            uint8_t *ptr=desc[indexPps].start+count-1;
-            while(count > 4)
-            {
-                if(*ptr) break;
-                ptr--;
-                count--;
-            }
-            ADM_info("PPS removed zero filler %d -> %d\n",(int)desc[indexPps].size,(int)count);
-            desc[indexPps].size=count;
-        }
-       
-        if(indexSps!=-1 && indexPps!=-1)
+        ADM_warning("Cannot read first image\n");
+        return false;
+    }
+    myBitstream->len=img.dataLength;
+    NALU_descriptor desc[MAX_NALU_PER_CHUNK];
+    //mixDump(img.data,img.dataLength);
+    int nbNalu=ADM_splitNalu(myBitstream->data,myBitstream->data+myBitstream->len,
+                            MAX_NALU_PER_CHUNK,desc);
+    // search sps
+    uint8_t *spsStart,*ppsStart;
+    uint32_t spsLen=0, ppsLen=0;
+    int indexSps,indexPps;
+
+    indexSps=ADM_findNalu(NAL_SPS,nbNalu,desc);
+    if(-1==indexSps)
+    {
+        ADM_error("Cannot find SPS");
+        return false;
+    }
+    indexPps=ADM_findNalu(NAL_PPS,nbNalu,desc);
+    if(-1==indexPps)
+    {
+        ADM_error("Cannot find SPS");
+        return false;
+    }else
+    {
+        int count=desc[indexPps].size;
+        uint8_t *ptr=desc[indexPps].start+count-1;
+        while(count > 4)
         {
-            spsLen=desc[indexSps].size;
-            ppsLen=desc[indexPps].size;
-            
-            ADM_info("Copy from annexB: Found sps=%d, pps=%d.\n",(int)spsLen,(int)ppsLen);
-            // Build extraData
-            myExtraLen=5+1+2+1+spsLen+1+2+1+ppsLen;
-            myExtra=new uint8_t[myExtraLen];
-            uint8_t *ptr=myExtra;
-            uint8_t *sps=desc[indexSps].start;
-            *ptr++=1;           // AVC version
-            *ptr++=sps[0];        // Profile
-            *ptr++=sps[1];        // Profile
-            *ptr++=sps[2];        // Level
-            *ptr++=0xff;        // Nal size minus 1
-
-            *ptr++=0xe1;        // SPS
-            *ptr++=(1+spsLen)>>8;
-            *ptr++=(1+spsLen)&0xff;
-            *ptr++=desc[indexSps].nalu;
-            memcpy(ptr,desc[indexSps].start,spsLen);
-            ptr+=spsLen;
-
-            *ptr++=0x1;         // PPS
-            *ptr++=(1+ppsLen)>>8;
-            *ptr++=(1+ppsLen)&0xff;
-            *ptr++=desc[indexPps].nalu;
-            memcpy(ptr,desc[indexPps].start,ppsLen);
-            ptr+=ppsLen;
-
-            ADM_info("generated %d bytes of extradata.\n",(int)myExtraLen);
-            mixDump(myExtra, myExtraLen);
+            if(*ptr) break;
+            ptr--;
+            count--;
         }
+        ADM_info("PPS removed zero filler %d -> %d\n",(int)desc[indexPps].size,(int)count);
+        desc[indexPps].size=count;
+    }
+
+    spsLen=desc[indexSps].size;
+    ppsLen=desc[indexPps].size;
+
+    ADM_info("Copy from annexB: Found sps=%d, pps=%d.\n",(int)spsLen,(int)ppsLen);
+    // Build extraData
+    myExtraLen=5+1+2+1+spsLen+1+2+1+ppsLen;
+    myExtra=new uint8_t[myExtraLen];
+    uint8_t *ptr=myExtra;
+    uint8_t *sps=desc[indexSps].start;
+    *ptr++=1;           // AVC version
+    *ptr++=sps[0];        // Profile
+    *ptr++=sps[1];        // Profile
+    *ptr++=sps[2];        // Level
+    *ptr++=0xff;        // Nal size minus 1
+
+    *ptr++=0xe1;        // SPS
+    *ptr++=(1+spsLen)>>8;
+    *ptr++=(1+spsLen)&0xff;
+    *ptr++=desc[indexSps].nalu;
+    memcpy(ptr,desc[indexSps].start,spsLen);
+    ptr+=spsLen;
+
+    *ptr++=0x1;         // PPS
+    *ptr++=(1+ppsLen)>>8;
+    *ptr++=(1+ppsLen)&0xff;
+    *ptr++=desc[indexPps].nalu;
+    memcpy(ptr,desc[indexPps].start,ppsLen);
+    ptr+=ppsLen;
+
+    ADM_info("generated %d bytes of extradata.\n",(int)myExtraLen);
+    mixDump(myExtra, myExtraLen);
+    return true;
+}
+
+/**
+ * 
+ * @param ptr
+ * @param naluType
+ * @param size
+ * @param data
+ * @return 
+ */
+static uint8_t *writeNaluH265(uint8_t *ptr, NALU_descriptor *d)
+{
+    *ptr++=(d->nalu>>1)&0x3f;  //  VPS, SPS, PPS, SEI.  0x20 0x21 0x22
+    *ptr++=0x00; // 1 NALU
+    *ptr++=0x01;
+    *ptr++=(d->size+1)>>8;
+    *ptr++=(d->size+1)&0xff;
+    *ptr++=d->nalu;
+    memcpy(ptr,d->start,d->size);
+    return ptr+d->size;
+}
+
+/**
+ * \fn extractExtraDataH265
+ * We need to pack VPS/PPS/SPS MP4 style
+ * 
+ * order should be  VPS, SPS, PPS, SEI. 
+ */
+bool ADM_videoStreamCopyFromAnnexB::extractExtraDataH265()

avidemux_2.6.18.tar.gz/avidemux/common/ADM_render/GUI_dxva2Render.cpp -> avidemux_2.6.19.tar.gz/avidemux/common/ADM_render/GUI_dxva2Render.cpp Changed

avidemux_2.6.18.tar.gz/avidemux/common/ADM_render/GUI_render.h -> avidemux_2.6.19.tar.gz/avidemux/common/ADM_render/GUI_render.h Changed

avidemux_2.6.18.tar.gz/avidemux/common/ADM_render/GUI_vdpauRender.cpp -> avidemux_2.6.19.tar.gz/avidemux/common/ADM_render/GUI_vdpauRender.cpp Changed

avidemux_2.6.18.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp -> avidemux_2.6.19.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_dxva2.cpp Changed

@@ -99,6 +99,17 @@
 #endif
 
 /**
+  \fn dxvaBitDepthFromContext
+*/
+static int dxvaBitDepthFromContext(AVCodecContext *avctx)
+{
+
+  if(avctx->sw_pix_fmt==AV_PIX_FMT_YUV420P10) // not sure
+      return 10;
+  return 8;
+}
+
+/**
  *
  * @param instance
  * @param cookie
@@ -293,12 +304,13 @@
     }
 
     // Allocate surfaces..
-    if(!admDxva2::allocateD3D9Surface(num_surfaces,avctx->coded_width,avctx->coded_height,surfaces,align))
+    int bits=dxvaBitDepthFromContext(avctx);
+    if(!admDxva2::allocateD3D9Surface(num_surfaces,avctx->coded_width,avctx->coded_height,surfaces,align,bits))
     {
         ADM_warning("Cannot allocate surfaces \n");
         return ;
     }
-    dx_context->decoder=admDxva2::createDecoder(avctx->codec_id,avctx->coded_width, avctx->coded_height,num_surfaces,surfaces,align);
+    dx_context->decoder=admDxva2::createDecoder(avctx->codec_id,avctx->coded_width, avctx->coded_height,num_surfaces,surfaces,align,bits);
     aprintf("Decoder=%p\n",dx_context->decoder);
     if(!dx_context->decoder)
     {
@@ -323,7 +335,7 @@
 
     dx_context->surface         = surfaces;
     dx_context->surface_count   = num_surfaces;
-    dx_context->cfg             = admDxva2::getDecoderConfig(avctx->codec_id);
+    dx_context->cfg             = admDxva2::getDecoderConfig(avctx->codec_id,bits);
 
     ADM_info("Ctor Successfully setup DXVA2 hw accel (%d surface created, ffdxva=%p,parent=%p,context=%p)\n",num_surfaces,this,parent,avctx);
     alive=true;
@@ -586,7 +598,8 @@
 
     outputFormat=ofmt;
     ADM_info("This is maybe supported by DXVA2...\n");
-    if(!admDxva2::supported(avctx->codec_id))
+    int bits=dxvaBitDepthFromContext(avctx);
+    if(!admDxva2::supported(avctx->codec_id,bits)) // not sure either
     {
         ADM_warning("Not supported by DXVA2\n");
         return false;

avidemux_2.6.18.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp -> avidemux_2.6.19.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_libva.cpp Changed

avidemux_2.6.18.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_vdpau.cpp -> avidemux_2.6.19.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_vdpau.cpp Changed

@@ -60,7 +60,8 @@
     ADM_VDPAU_INVALID=0,
     ADM_VDPAU_H264=1,
     ADM_VDPAU_MPEG2=2,
-    ADM_VDPAU_VC1=3
+    ADM_VDPAU_VC1=3,
+    ADM_VDPAU_H265=4,
 }ADM_VDPAU_TYPE;
 
 #ifdef USE_VDPAU
@@ -212,20 +213,26 @@
     AVCodecID id=AV_CODEC_ID_NONE;
     AVPixelFormat c;
     AVPixelFormat outPix;
+    int maxW,maxH;
     if(avctx->sw_pix_fmt==AV_PIX_FMT_YUV420P) // doont even try non yv12 for the moment
         for(i=0;fmt[i]!=AV_PIX_FMT_NONE;i++)
         {
             c=fmt[i];
             ADM_info("[vdpau]: Evaluating %d\n",c);
             if(c!=AV_PIX_FMT_VDPAU) continue;        
-    #define FMT_V_CHECK(x,y)      case AV_CODEC_ID_##x:   outPix=AV_PIX_FMT_VDPAU_##y;id=avctx->codec_id;break;
+    #define FMT_V_CHECK(x,y)      case AV_CODEC_ID_##x:  \
+                                         if(admVdpau::queryDecoderCapabilities(y,&maxW,&maxH)) \
+                                         { id=avctx->codec_id;\
+                                         outPix=AV_PIX_FMT_VDPAU ;}else {ADM_info(#x ":Not supported by HW\n");}\
+                                         break;
             switch(avctx->codec_id)
             {
-                FMT_V_CHECK(H264,H264)
-                FMT_V_CHECK(MPEG1VIDEO,MPEG1)
-                FMT_V_CHECK(MPEG2VIDEO,MPEG2)
-                FMT_V_CHECK(WMV3,WMV3)
-                FMT_V_CHECK(VC1,VC1)
+                FMT_V_CHECK(H264,      VDP_DECODER_PROFILE_H264_HIGH)
+                FMT_V_CHECK(HEVC,      VDP_DECODER_PROFILE_HEVC_MAIN) 
+                FMT_V_CHECK(MPEG1VIDEO,VDP_DECODER_PROFILE_MPEG1)
+                FMT_V_CHECK(MPEG2VIDEO,VDP_DECODER_PROFILE_MPEG2_MAIN)
+                FMT_V_CHECK(WMV3,      VDP_DECODER_PROFILE_VC1_MAIN)
+                FMT_V_CHECK(VC1,       VDP_DECODER_PROFILE_VC1_MAIN)
                 default: 
                     continue;
                     break;
@@ -278,29 +285,28 @@
 {
         alive=true;
         avVdCtx=NULL;
-        ADM_VDPAU_TYPE vdpauType=ADM_VDPAU_INVALID;
+        
         AVCodecID codecID;
-        int vdpDecoder=0;
         const char *name="";
         VdpDevice dev=(VdpDevice)(uint64_t)admVdpau::getVdpDevice();
         
         switch(_context->codec_id)
         {
+            case AV_CODEC_ID_HEVC:
+                 name="h265";
+                 break;
             case AV_CODEC_ID_H264:
-                 vdpauType=ADM_VDPAU_H264;
                  name="h264";
-                 vdpDecoder=VDP_DECODER_PROFILE_H264_HIGH;
                  break;
             case AV_CODEC_ID_VC1:
-                  vdpauType=ADM_VDPAU_VC1;
                   name="vc1";
-                  vdpDecoder=VDP_DECODER_PROFILE_VC1_ADVANCED;
                   break;
             case AV_CODEC_ID_MPEG2VIDEO:
-                  vdpauType=ADM_VDPAU_MPEG2;
-                  vdpDecoder=VDP_DECODER_PROFILE_MPEG2_MAIN;
                   name="mpegvideo";
                   break;
+            case AV_CODEC_ID_WMV3:
+                  name="wm3_vdpau";
+                  break;
             default:
                 ADM_assert(0);
                 break;

avidemux_2.6.18.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_videoCodec.cpp -> avidemux_2.6.19.tar.gz/avidemux/common/ADM_videoCodec/src/ADM_videoCodec.cpp Changed

avidemux_2.6.18.tar.gz/avidemux/common/ADM_videoFilter2/src/ADM_videoFilters.cpp -> avidemux_2.6.19.tar.gz/avidemux/common/ADM_videoFilter2/src/ADM_videoFilters.cpp Changed

avidemux_2.6.18.tar.gz/avidemux/common/gui_action.names -> avidemux_2.6.19.tar.gz/avidemux/common/gui_action.names Changed

avidemux_2.6.18.tar.gz/avidemux/common/gui_main.cpp -> avidemux_2.6.19.tar.gz/avidemux/common/gui_main.cpp Changed

@@ -245,7 +245,7 @@
 
                             ADM_assert(name[rank].size());
                             call_scriptEngine(name[rank].c_str());
-
+                            A_Resync();
                             return;
             }
     case ACT_VIDEO_CODEC_CONFIGURE:
@@ -297,6 +297,7 @@
         {
             ADM_info("Saving prefs\n");
             prefs->save ();
+            UI_applySettings();
         }
         return;
     case ACT_SavePref:
@@ -471,6 +472,16 @@
         UI_setMarkers (markA, markB);
       break;
     }
+    case ACT_ResetMarkers:
+    {
+        if(!video_body->getMarkerAPts() && video_body->getMarkerBPts()==video_body->getVideoDuration())
+            break; // do nothing if the markers were not moved
+        video_body->addToUndoQueue();
+        A_ResetMarkers();
+        A_Resync();
+        GUI_setCurrentFrameAndTime();
+        break;
+    }
     case ACT_Copy:
     {
                 uint64_t markA,markB;
@@ -708,11 +719,18 @@
         res = video_body->addFile(longname);
 
     //  DIA_StopBusy ();
+    int ac=0; // audio codec = copy
     bool loadDefault;
     if(!prefs->get(RESET_ENCODER_ON_VIDEO_LOAD, &loadDefault)) loadDefault=false;
     // if true, discard changes in output config on video load
     if(loadDefault)
+    {
         A_loadDefaultSettings();
+        UI_setAudioCodec(ac); // revert to copy, we don't save default audio codec config yet
+    }else
+    {
+        ac=UI_getCurrentACodec();
+    }
     // forget last project file
     video_body->setProjectName("");
 
@@ -761,8 +779,10 @@
 #endif
         /* remember any video or workbench file to "recent" */
         prefs->set_lastfile(longname);
-        UI_updateRecentMenu();
         updateLoaded();
+        UI_updateRecentMenu();
+        if(video_body->getNumberOfActiveAudioTracks())
+            audioCodecSetByIndex(0,ac); // try to preserve audio codec
         if (currentaudiostream)
         {
             uint32_t nbAudio;
@@ -1366,6 +1386,7 @@
         if(!avifileinfo) return;
         GUI_setAllFrameAndTime();
         UI_setMarkers (video_body->getMarkerAPts(),video_body->getMarkerBPts());
+        UI_setAudioTrackCount(video_body->getNumberOfActiveAudioTracks());
 }
 uint8_t  DIA_job_select(char **jobname, char **filename);
 void A_addJob(void)
@@ -1449,6 +1470,7 @@
         admPreview::stop();
         setPreviewMode(ADM_PREVIEW_NONE);
       }
+      UI_setNeedsResizingFlag(false);
       delete avifileinfo;
       //delete wavinfo;
       admPreview::destroy();
@@ -1473,6 +1495,8 @@
 
 void GUI_avsProxy(void)
 {
+  if(playing)
+      return;
   uint8_t res;

avidemux_2.6.18.tar.gz/avidemux/common/gui_savenew.cpp -> avidemux_2.6.19.tar.gz/avidemux/common/gui_savenew.cpp Changed

@@ -26,9 +26,6 @@
 #include "ADM_coreAudio.h"
 #include "ADM_encoderConf.h"
 
-#include "ADM_encoderConf.h"
-
-
 #include "DIA_fileSel.h"
 #include "ADM_commonUI/GUI_ui.h"
 #include "ADM_muxer.h"
@@ -73,6 +70,7 @@
         bool                  setupAudio();
         ADM_audioStream      *audioAccess[ADM_MAX_AUDIO_STREAM]; // audio tracks to feed to the muxer
         int                   nbAudioTracks;
+        Clock                ticktock;
         
 public:
                               admSaver(const char *out);
@@ -182,15 +180,26 @@
         {
             printf("[Save] setup failed for pass1 encoder\n");
             delete pass1;
+            pass1=NULL;
             return NULL;
         }
-        ADMBitstream bitstream;
 
+        if(!(muxer=ADM_MuxerSpawnFromIndex(muxerIndex)))
+        {
+            GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Muxer"),QT_TRANSLATE_NOOP("adm","Cannot instantiate muxer"));
+            delete pass1;
+            pass1=NULL;
+            return NULL;
+        }
+        muxer->createUI(videoDuration);
+        muxer->getEncoding()->setPhasis("Pass 1"); // don't make it translatable here, this is done in the encoding dialog
+
+        ADMBitstream bitstream;
         uint8_t *buffer=new uint8_t[BUFFER_SIZE];
         bitstream.data=buffer;
         bitstream.bufferSize=BUFFER_SIZE;
-        DIA_workingBase  *encoding=createWorking("Pass1");
         int nbFrames=0;
+        uint32_t percent=0;
         while(pass1->encode(&bitstream))
         {
             if(bitstream.pts!=ADM_NO_PTS)
@@ -198,19 +207,30 @@
                 float f=100;
                 f/=videoDuration;
                 f*=bitstream.pts;
-                uint32_t percent=(uint32_t)f;
-                if(encoding->update(percent))
+                uint32_t p=(uint32_t)f;
+                if(percent<p)
+                    percent=p; // avoid progress bar going backwards
+                if(!muxer->getEncoding()->isAlive())
                 {
                     abort=true;
                     break;
                 }
+                muxer->getEncoding()->setPercent(percent);
+                uint32_t elapsed=ticktock.getElapsedMS();
+                if(percent>=1)
+                {
+                    double totalTime=(100*elapsed)/percent;
+                    double remaining=totalTime-elapsed;
+                    if(remaining<0)
+                        remaining=0;
+                    uint32_t remainingMs=(uint32_t)remaining;
+                    muxer->getEncoding()->setRemainingTimeMS(remainingMs);
+                }
             }
             nbFrames++;
         }
-        delete encoding;
         delete [] buffer;
         delete pass1;
-        encoding=NULL;
         buffer=NULL;
         pass1=NULL;
 
@@ -263,7 +283,7 @@
         video_body->getExtraHeaderData(&extraLen,&extra);
 //#warning do something better
         ADM_videoStreamCopy *copy=NULL;        
-        if(isH264Compatible(info.fcc))
+        if(isH264Compatible(info.fcc) || isH265Compatible(info.fcc))
         {
             bool isAnnexB=!extraLen; // this is not very good
             if(muxer->preferH264AnnexB())
@@ -419,7 +439,7 @@
         }
     }
 
-    if(!(muxer=ADM_MuxerSpawnFromIndex(muxerIndex)))
+    if(!muxer && !(muxer=ADM_MuxerSpawnFromIndex(muxerIndex)))
     {
         GUI_Error_HIG(QT_TRANSLATE_NOOP("adm","Muxer"),QT_TRANSLATE_NOOP("adm","Cannot instantiate muxer"));
         return 0;

avidemux_2.6.18.tar.gz/avidemux/qt4/ADM_UIs/include/DIA_flyDialogQt4.h -> avidemux_2.6.19.tar.gz/avidemux/qt4/ADM_UIs/include/DIA_flyDialogQt4.h Changed

@@ -2,8 +2,8 @@
         \fn DIA_flyDialogQt4.h
  copyright            : (C) 2007 by mean
  email                : fixounet@free.fr
- 
- 
+
+
  ***************************************************************************/
 
 /***************************************************************************
@@ -29,6 +29,7 @@
 #include <QFrame>
 #include <QTimer>
 #include <QDialog>
+#include <QLabel>
 
 #include "ADM_default.h"
 #include "ADM_rgb.h"
@@ -54,18 +55,18 @@
 class ADM_UIQT46_EXPORT ADM_QCanvas : public QWidget
 {
 protected:
-	uint32_t _w,_h;
+        uint32_t _w,_h;
 public:
-	uint8_t *dataBuffer;
+        uint8_t *dataBuffer;
 
-	ADM_QCanvas(QWidget *z, uint32_t w, uint32_t h);
-	~ADM_QCanvas();
-	void paintEvent(QPaintEvent *ev);
-	void changeSize(uint32_t w, uint32_t h);
+        ADM_QCanvas(QWidget *z, uint32_t w, uint32_t h);
+        ~ADM_QCanvas();
+        void paintEvent(QPaintEvent *ev);
+        void changeSize(uint32_t w, uint32_t h);
 };
 
 
-
+class flyControl;
 /**
     \class ADM_flyDialog
     \brief Base class for flyDialog
@@ -74,7 +75,7 @@
 {
   Q_OBJECT
  protected:     
-         QTimer             timer;
+          QTimer        timer;
           uint32_t      _w, _h, _zoomW, _zoomH;
           float         _zoom;
           uint32_t      _zoomChangeCount;
@@ -82,26 +83,26 @@
           uint64_t      lastPts;
           double        _computedZoom;
           int           _usedWidth, _usedHeight;
-          
+          int           _frameIncrement; // time between image in ms
+          Clock         _clock;
+          int           _nextRdv;
+
           ADM_coreVideoFilter *_in;
-      
+
           ADMImage      *_yuvBuffer;
           ADM_byteBuffer _rgbByteBufferDisplay;
+
+          flyControl  *_control;
           
-          QPushButton *pushButton_back1mn;
-          QPushButton *pushButton_play;
-          QPushButton *pushButton_next;
-          QPushButton *pushButton_fwd1mn;
-          QRadioButton *radioButton_autoZoom;
           QDialog     *_parent;
 
-          
-          
+
+
   public:
           void          *_cookie; // whatever, usually the ui_xxx component
           QSlider       *_slider; // widget
           ADM_QCanvas   *_canvas; // Drawing zone
-          
+
   public:
                             ADM_flyDialog(QDialog *parent,uint32_t width, uint32_t height, ADM_coreVideoFilter *in,
                                  ADM_QCanvas *canvas, QSlider *slider, ResizeMethod resizeMethod);
@@ -125,7 +126,7 @@
            virtual           void resetScaler(void)=0; // dont bother, implemented by yuv or rgb subclass
            virtual           bool process(void)=0; // dont bother, implemented by yuv or rgb subclass
 public:
-  
+
   virtual uint8_t    download(void)=0;
   virtual uint8_t    upload(void)=0;
   //virtual uint8_t  update(void)=0;
@@ -133,10 +134,10 @@
   virtual bool       setCurrentPts(uint64_t pts) {return true;};
 
 
-         
+
 // UI dependant part : They are implemented in ADM_flyDialogGtk/Qt/...
 public:  
-  
+
   virtual bool     isRgbInverted(void);
   virtual uint8_t  display(uint8_t *rgbData);
   virtual float    calcZoomFactor(void);  
@@ -150,7 +151,7 @@
 
 private:
   virtual bool     nextImageInternal(void);
-  
+
 public slots:
         virtual bool nextImage(void);
         virtual void backOneMinute(void);
@@ -171,13 +172,13 @@
 public:
           virtual    bool process(void);
           virtual    void resetScaler(void);
-          
+
                                 ADM_flyDialogYuv(QDialog *parent,uint32_t width, uint32_t height, ADM_coreVideoFilter *in,
                                 ADM_QCanvas *canvas, QSlider *slider, 
                                 ResizeMethod resizeMethod);
             virtual             ~ADM_flyDialogYuv();
             virtual uint8_t    processYuv(ADMImage* in, ADMImage *out) =0;
- 
+
 };
 
 /**
@@ -194,7 +195,7 @@
 public:
           virtual    bool process(void);
           virtual    void resetScaler(void);
-          
+
                             ADM_flyDialogRgb(QDialog *parent,uint32_t width, uint32_t height, 
                                  ADM_coreVideoFilter *in,  ADM_QCanvas *canvas,  QSlider *slider, ResizeMethod resizeMethod);
            virtual          ~ADM_flyDialogRgb();
@@ -206,13 +207,13 @@
  */
 class ADM_UIQT46_EXPORT FlyDialogEventFilter : public QObject
 {
-	ADM_flyDialog *flyDialog;
-	bool recomputed;
+        ADM_flyDialog *flyDialog;
+        bool recomputed;
 
 public:
-	FlyDialogEventFilter(ADM_flyDialog *flyDialog);
+        FlyDialogEventFilter(ADM_flyDialog *flyDialog);
 
 protected:
-	bool eventFilter(QObject *obj, QEvent *event);
+        bool eventFilter(QObject *obj, QEvent *event);
 };

avidemux_2.6.18.tar.gz/avidemux/qt4/ADM_UIs/include/T_openGLFilter.h -> avidemux_2.6.19.tar.gz/avidemux/qt4/ADM_UIs/include/T_openGLFilter.h Changed

avidemux_2.6.18.tar.gz/avidemux/qt4/ADM_UIs/src/DIA_flyDialog.cpp -> avidemux_2.6.19.tar.gz/avidemux/qt4/ADM_UIs/src/DIA_flyDialog.cpp Changed

@@ -26,9 +26,87 @@
 #include <QHBoxLayout>
 #include <QApplication>
 #include "ADM_toolkitQt.h"
+#include "ADM_vidMisc.h"
 extern "C" {
 #include "libavcodec/avcodec.h"
 }
+/**
+ */
+class flyControl
+{
+public:
+        flyControl(QHBoxLayout *horizontalLayout_4)
+        {
+            
+            pushButton_back1mn = new QPushButton();
+            pushButton_back1mn->setObjectName(QString("pushButton_back1mn"));
+            pushButton_back1mn->setAutoRepeat(true);
+            pushButton_back1mn->setAutoRepeatDelay(1000);
+
+            horizontalLayout_4->addWidget(pushButton_back1mn);
+
+            pushButton_play = new QPushButton();
+            pushButton_play->setObjectName(QString("pushButton_play"));
+            pushButton_play->setCheckable(true);
+
+            horizontalLayout_4->addWidget(pushButton_play);
+
+            pushButton_next = new QPushButton();
+            pushButton_next->setObjectName(QString("pushButton_next"));
+            pushButton_next->setAutoRepeat(true);
+            pushButton_next->setAutoRepeatDelay(1000);
+
+            horizontalLayout_4->addWidget(pushButton_next);
+
+            pushButton_fwd1mn = new QPushButton();
+            pushButton_fwd1mn->setObjectName(QString("pushButton_fwd1mn"));
+            pushButton_fwd1mn->setAutoRepeat(true);
+            pushButton_fwd1mn->setAutoRepeatDelay(1000);
+
+            horizontalLayout_4->addWidget(pushButton_fwd1mn);
+
+            radioButton_autoZoom = new QRadioButton();
+            radioButton_autoZoom->setObjectName(QString("radioButton_autoZoom"));
+            radioButton_autoZoom->setChecked(true);
+
+            horizontalLayout_4->addWidget(radioButton_autoZoom);
+            //
+            labelTime=new QLabel();
+            labelTime->setText("00:00:00.000");
+            horizontalLayout_4->addWidget(labelTime);
+            //
+            QSpacerItem  *horizontalSpacer_4 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+            horizontalLayout_4->addItem(horizontalSpacer_4);
+
+            pushButton_back1mn->setToolTip(QApplication::translate("seekablePreviewDialog", "Back one minute", 0));
+            pushButton_back1mn->setText(QApplication::translate("seekablePreviewDialog", "<<", 0));
+            pushButton_play->setText(QApplication::translate("seekablePreviewDialog", "Play", 0));
+            pushButton_next->setToolTip(QApplication::translate("seekablePreviewDialog", "Next image", 0));
+            pushButton_next->setText(QApplication::translate("seekablePreviewDialog", ">", 0));
+            pushButton_fwd1mn->setText(QApplication::translate("seekablePreviewDialog", ">>", 0));
+            pushButton_fwd1mn->setToolTip(QApplication::translate("seekablePreviewDialog", "Forward one minute", 0));
+            radioButton_autoZoom->setText(QApplication::translate("seekablePreviewDialog", "A&utoZoom", 0));    
+         }
+        void disableButtons()
+        {
+            pushButton_back1mn->setEnabled(false);
+            pushButton_fwd1mn->setEnabled(false);
+            pushButton_next->setEnabled(false);
+        }
+        void enableButtons()
+        {
+            pushButton_back1mn->setEnabled(true);
+            pushButton_fwd1mn->setEnabled(true);
+            pushButton_next->setEnabled(true);
+        }
+public:
+        QPushButton *pushButton_back1mn;
+        QPushButton *pushButton_play;
+        QPushButton *pushButton_next;
+        QPushButton *pushButton_fwd1mn;
+        QRadioButton *radioButton_autoZoom;
+        QLabel       *labelTime;
+};
 
 /**
     \fn updateZoom
@@ -112,6 +190,11 @@
 #define DEL2(x)    if(x) {delete  x;x=NULL;}
 	DEL2(_yuvBuffer);
 	_rgbByteBufferDisplay.clean();
+        if(_control)
+        {
+            delete _control;
+            _control=NULL;
+        }
 	return 1;
 }
 /**
@@ -168,58 +251,14 @@
  */
 bool        ADM_flyDialog::addControl(QHBoxLayout *horizontalLayout_4)
 {
+       
         _parent->setSizePolicy(QSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum));
-        pushButton_back1mn = new QPushButton();
-        pushButton_back1mn->setObjectName(QString("pushButton_back1mn"));
-        pushButton_back1mn->setAutoRepeat(true);
-        pushButton_back1mn->setAutoRepeatDelay(1000);
-
-        horizontalLayout_4->addWidget(pushButton_back1mn);
-
-        pushButton_play = new QPushButton();
-        pushButton_play->setObjectName(QString("pushButton_play"));
-        pushButton_play->setCheckable(true);
-
-        horizontalLayout_4->addWidget(pushButton_play);
-
-        pushButton_next = new QPushButton();
-        pushButton_next->setObjectName(QString("pushButton_next"));
-        pushButton_next->setAutoRepeat(true);
-        pushButton_next->setAutoRepeatDelay(1000);
-
-        horizontalLayout_4->addWidget(pushButton_next);
-
-        pushButton_fwd1mn = new QPushButton();
-        pushButton_fwd1mn->setObjectName(QString("pushButton_fwd1mn"));
-        pushButton_fwd1mn->setAutoRepeat(true);
-        pushButton_fwd1mn->setAutoRepeatDelay(1000);
-
-        horizontalLayout_4->addWidget(pushButton_fwd1mn);
-        
-        radioButton_autoZoom = new QRadioButton();
-        radioButton_autoZoom->setObjectName(QString("radioButton_autoZoom"));
-        radioButton_autoZoom->setChecked(true);
-
-        horizontalLayout_4->addWidget(radioButton_autoZoom);
-
-        
-        QSpacerItem  *horizontalSpacer_4 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
-        horizontalLayout_4->addItem(horizontalSpacer_4);
-        
-        pushButton_back1mn->setToolTip(QApplication::translate("seekablePreviewDialog", "Back one minute", 0));
-        pushButton_back1mn->setText(QApplication::translate("seekablePreviewDialog", "<<", 0));
-        pushButton_play->setText(QApplication::translate("seekablePreviewDialog", "Play", 0));
-        pushButton_next->setToolTip(QApplication::translate("seekablePreviewDialog", "Next image", 0));
-        pushButton_next->setText(QApplication::translate("seekablePreviewDialog", ">", 0));
-        pushButton_fwd1mn->setText(QApplication::translate("seekablePreviewDialog", ">>", 0));
-        pushButton_fwd1mn->setToolTip(QApplication::translate("seekablePreviewDialog", "Forward one minute", 0));
-        radioButton_autoZoom->setText(QApplication::translate("seekablePreviewDialog", "A&utoZoom", 0));
-        
-        QObject::connect(pushButton_next ,SIGNAL(clicked()),this,SLOT(nextImage()));
-        QObject::connect(pushButton_back1mn ,SIGNAL(clicked()),this,SLOT(backOneMinute()));
-        QObject::connect(pushButton_fwd1mn ,SIGNAL(clicked()),this,SLOT(fwdOneMinute()));
-        QObject::connect(pushButton_play ,SIGNAL(toggled(bool )),this,SLOT(play(bool)));
-        QObject::connect(radioButton_autoZoom ,SIGNAL(toggled(bool )),this,SLOT(autoZoom(bool)));
+        _control=new flyControl(horizontalLayout_4);
+        QObject::connect(_control->pushButton_next ,SIGNAL(clicked()),this,SLOT(nextImage()));
+        QObject::connect(_control->pushButton_back1mn ,SIGNAL(clicked()),this,SLOT(backOneMinute()));
+        QObject::connect(_control->pushButton_fwd1mn ,SIGNAL(clicked()),this,SLOT(fwdOneMinute()));
+        QObject::connect(_control->pushButton_play ,SIGNAL(toggled(bool )),this,SLOT(play(bool)));
+        QObject::connect(_control->radioButton_autoZoom ,SIGNAL(toggled(bool )),this,SLOT(autoZoom(bool)));
       
         return true;
 }
@@ -249,6 +288,8 @@
     }
     lastPts=_yuvBuffer->Pts;
     setCurrentPts(lastPts);
+    if(_control)
+        _control->labelTime->setText(ADM_us2plain(lastPts));
     // Process...   
     process();
     return display(_rgbByteBufferDisplay.at(0));
@@ -343,11 +384,13 @@
                                 ADM_QCanvas *canvas, QSlider *slider, 
                                 ResizeMethod resizeMethod) : ADM_flyDialog(parent,width,height,in,canvas,slider,resizeMethod)
 {
+       _control=NULL;
         _yuvBufferOut=new ADMImageDefault(_w,_h);
         yuvToRgb=NULL;  
         initializeSize();
         updateZoom();
         postInit(false);
+        _nextRdv=0;
 }
 void ADM_flyDialogYuv::resetScaler(void)
 {
@@ -364,6 +407,11 @@
 {
     if(_yuvBufferOut) delete _yuvBufferOut;
     _yuvBufferOut=NULL;
+    if(_control)
+    {
+        delete _control;
+        _control=NULL;
+    }
 }
 bool ADM_flyDialogYuv::process(void)

avidemux_2.6.18.tar.gz/avidemux/qt4/ADM_UIs/src/T_openGL.cpp -> avidemux_2.6.19.tar.gz/avidemux/qt4/ADM_UIs/src/T_openGL.cpp Changed

@@ -80,4 +80,44 @@
         ADM_glExt::deleteBuffers(1,&bufferARB);
     bufferARB=0;
 }
+/**
+ * 
+ * @param type
+ * @param proggy
+ * @return 
+ */
+QGLShaderProgram *ADM_coreVideoFilterQtGl::createShaderFromSource(QGLShader::ShaderType type,const char *proggy)
+{
+    QGLShaderProgram *glProg = new QGLShaderProgram(_context);
+    ADM_assert(glProg);
+    if ( !glProg->addShaderFromSourceCode(type, proggy))
+    {
+            ADM_error("[GL Render] Fragment log: %s\n", glProg->log().toUtf8().constData());
+            delete glProg;
+            glProg=NULL;
+            return NULL;
+    }
+    
+    if ( !glProg->link())
+    {
+            ADM_error("[GL Render] Link log: %s\n", glProg->log().toUtf8().constData());
+            delete glProg;
+            glProg=NULL;
+            return NULL;
+    }
+
+    if ( !glProg->bind())
+    {
+            ADM_error("[GL Render] Binding FAILED\n");
+            delete glProg;
+            glProg=NULL;
+            return NULL;
+
+    }
+
+    return glProg;
+}
+
+
+
 // EOF

avidemux_2.6.18.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/CMakeLists.txt -> avidemux_2.6.19.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/CMakeLists.txt Changed

avidemux_2.6.18.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_about.cpp -> avidemux_2.6.19.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_about.cpp Changed

avidemux_2.6.18.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_encoding.cpp -> avidemux_2.6.19.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/Q_encoding.cpp Changed

@@ -105,9 +105,11 @@
                 
 	}else
         {
-            ui->comboBoxPriority->setEnabled(false);
+            ui->comboBoxPriority->setVisible(false);
+            ui->labelPrio->setVisible(false);
         }
 #endif
+        ui->checkBoxShutdown->setVisible(false); // shutdown is disabled, hide the checkbox on all platforms
 
 	connect(ui->checkBoxShutdown, SIGNAL(stateChanged(int)), this, SLOT(shutdownChanged(int)));
 	connect(ui->pushButton1, SIGNAL(pressed()), this, SLOT(useTrayButtonPressed()));
@@ -153,7 +155,7 @@
 {
     ADM_info("Destroying encoding qt4\n");
     UI_getTaskBarProgress()->disable();
-    bool shutdownRequired = (ui->checkBoxShutdown->checkState() == Qt::Checked);
+    //bool shutdownRequired = (ui->checkBoxShutdown->checkState() == Qt::Checked);
     if(tray)
     {
         UI_deiconify();
@@ -176,9 +178,22 @@
 
 void DIA_encodingQt4::setPhasis(const char *n)
 {
-          ADM_assert(ui);
-          WRITEM(labelPhasis,n);
-
+    ADM_assert(ui);
+    if(!strcmp(n,"Pass 1"))
+    {
+        ui->tabWidget->setTabEnabled(1, false); // disable the "Advanced" tab
+        ui->checkBoxShutdown->setVisible(false); // hide the shutdown checkbox
+        this->setWindowTitle(QT_TRANSLATE_NOOP("qencoding","First Pass"));
+        WRITEM(labelPhasis,QT_TRANSLATE_NOOP("qencoding","Pass 1"));
+    }else
+    {
+        this->setWindowTitle(QT_TRANSLATE_NOOP("qencoding","Encoding..."));
+        ui->tabWidget->setTabEnabled(1, true);
+#if 0
+        ui->checkBoxShutdown->setVisible(true);
+#endif
+        WRITEM(labelPhasis,n);
+    }
 }
 /**
     \fn    setFrameCount

avidemux_2.6.18.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/encoding.ui -> avidemux_2.6.19.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_dialog/encoding.ui Changed

avidemux_2.6.18.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_seekablePreview.cpp -> avidemux_2.6.19.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_seekablePreview.cpp Changed

@@ -64,7 +64,7 @@
 	canvas = new ADM_QCanvas(ui.frame, canvasWidth, canvasHeight);
 	canvas->show();
 	seekablePreview = new flySeekablePreview(this,canvasWidth, canvasHeight, videoStream, canvas, ui.horizontalSlider);	
-        seekablePreview->setCookieFunc(setCurrentPtsCallback,this);
+        setDuration(videoStream->getInfo()->totalDuration);
 	seekablePreview->sliderChanged();
 }
 /**
@@ -76,25 +76,12 @@
 	return seekablePreview->sliderGet();
 }
 /**
-    \fn setCurrentPtsCallback
-    \brief callback so that the flyDialog can update its father widget
+    \fn setDuration
+    \brief Set total duration
 */
-bool Ui_seekablePreviewWindow::setCurrentPtsCallback(void *cookie,uint64_t pts)
+bool      Ui_seekablePreviewWindow::setDuration(uint64_t duration)
 {
-    if(cookie)
-    {
-        return ((Ui_seekablePreviewWindow *)cookie)->setTime(pts);
-    }
-    printf("No cookie, New PTS :%" PRId64" us\n",pts);
-    return true;
-}
-/**
-    \fn setTime
-    \brief Set timecode
-*/
-bool      Ui_seekablePreviewWindow::setTime(uint64_t timestamp)
-{
-    const char *s=ADM_us2plain(timestamp);
+    const char *s=ADM_us2plain(duration);
     ui.label->setText(s);
     return true;
 }

avidemux_2.6.18.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_seekablePreview.h -> avidemux_2.6.19.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_seekablePreview.h Changed

avidemux_2.6.18.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp -> avidemux_2.6.19.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.cpp Changed

@@ -27,6 +27,7 @@
 
 #include "DIA_fileSel.h"
 #include "ADM_vidMisc.h"
+#include "ADM_last.h"
 #include "prefs.h"
 #include "avi_vars.h"
 
@@ -98,6 +99,7 @@
 
 extern void saveCrashProject(void);
 extern uint8_t AVDM_setVolume(int volume);
+extern bool AVDM_hasVolumeControl(void);
 extern bool ADM_QPreviewCleanup(void);
 extern void vdpauCleanup();
 extern bool A_loadDefaultSettings(void);;
@@ -107,6 +109,8 @@
 static bool uiRunning=false;
 static bool uiIsMaximized=false;
 
+bool needsResizing=false;
+
 #define WIDGET(x)  (((MainWindow *)QuiMainWindows)->ui.x)
 
 #define CONNECT(object,zzz) connect( (ui.object),SIGNAL(triggered()),this,SLOT(buttonPressed()));
@@ -344,10 +348,12 @@
     MainWindow::mainWindowSingleton=this;
     qtRegisterDialog(this);
     ui.setupUi(this);
-        dragState=dragState_Normal;
-        refreshCapEnabled=false;
-        prefs->get(FEATURES_CAP_REFRESH_ENABLED,&refreshCapEnabled);
-        prefs->get(FEATURES_CAP_REFRESH_VALUE,&refreshCapValue);
+    dragState=dragState_Normal;
+    refreshCapEnabled=false;
+    prefs->get(FEATURES_CAP_REFRESH_ENABLED,&refreshCapEnabled);
+    prefs->get(FEATURES_CAP_REFRESH_VALUE,&refreshCapValue);
+    recentFiles = NULL;
+    recentProjects = NULL;
 
 #if defined(__APPLE__) && defined(USE_SDL)
     //ui.actionAbout_avidemux->setMenuRole(QAction::NoRole);
@@ -432,7 +438,8 @@
     addScriptEnginesToFileMenu(myMenuFile);
     addScriptShellsToToolsMenu(myMenuTool);
     buildMyMenu();
-    buildCustomMenu();
+    buildCustomMenu(); // action lists are populated (i.e. buildActionLists() called) within buildCustomMenu()
+    buildButtonLists();
     // Crash in some cases addScriptReferencesToHelpMenu();
 
     QString rFiles=QString::fromUtf8(QT_TRANSLATE_NOOP("qgui2","Recent Files"));
@@ -453,7 +460,7 @@
     this->setFocus(Qt::OtherFocusReason);
 
     setAcceptDrops(true);
-        setWindowIcon(QIcon(":/new/prefix1/pics/avidemux_icon_small.png"));
+        setWindowIcon(QIcon(MKICON(avidemux_icon_small)));
 
     // Hook also the toolbar
     connect(ui.toolBar,  SIGNAL(actionTriggered ( QAction *)),this,SLOT(searchToolBar(QAction *)));
@@ -471,6 +478,8 @@
     ui.volumeWidget->setTitleBarWidget(dummy3);
     ui.audioMetreWidget->setTitleBarWidget(dummy4);
 
+    widgetsUpdateTooltips();
+
     this->adjustSize();
         QuiTaskBarProgress=createADMTaskBarProgress();
 }
@@ -516,6 +525,12 @@
 */
 bool MainWindow::buildMenu(QMenu *root,MenuEntry *menu, int nb)
 {
+    bool alt=false, swpud=false;
+    if(menu==&myMenuEdit[0] || menu==&myMenuGo[0])
+    {
+        prefs->get(KEYBOARD_SHORTCUTS_USE_ALTERNATE_KBD_SHORTCUTS,&alt);
+        prefs->get(KEYBOARD_SHORTCUTS_SWAP_UP_DOWN_KEYS,&swpud);
+    }
     QMenu *subMenu=NULL;
     for(int i=0;i<nb;i++)
     {
@@ -547,8 +562,45 @@
 			a->setMenuRole(QAction::NoRole);
 #endif 
                         m->cookie=(void *)a;
-                        if(m->shortCut)
+                        if(swpud && m->shortCut=="Up")
+                            a->setShortcut(QKeySequence("Down"));
+                        else if(swpud && m->shortCut=="Down")
+                            a->setShortcut(QKeySequence("Up"));
+                        else if(m->shortCut)
                         {
+                            if(alt)
+                            {
+                                std::string sc="";
+                                switch(m->event)
+                                {
+                                    case ACT_MarkA:
+                                        prefs->get(KEYBOARD_SHORTCUTS_ALT_MARK_A,sc);
+                                        break;
+                                    case ACT_MarkB:
+                                        prefs->get(KEYBOARD_SHORTCUTS_ALT_MARK_B,sc);
+                                        break;
+                                    case ACT_ResetMarkers:
+                                        prefs->get(KEYBOARD_SHORTCUTS_ALT_RESET_MARKERS,sc);
+                                        break;
+                                    case ACT_GotoMarkA:
+                                        prefs->get(KEYBOARD_SHORTCUTS_ALT_GOTO_MARK_A,sc);
+                                        break;
+                                    case ACT_GotoMarkB:
+                                        prefs->get(KEYBOARD_SHORTCUTS_ALT_GOTO_MARK_B,sc);
+                                        break;
+                                    case ACT_Begin:
+                                        prefs->get(KEYBOARD_SHORTCUTS_ALT_BEGIN,sc);
+                                        break;
+                                    case ACT_End:
+                                        prefs->get(KEYBOARD_SHORTCUTS_ALT_END,sc);
+                                        break;
+                                    default:
+                                        sc=std::string(m->shortCut);
+                                }
+                                QString qsc=QString::fromUtf8(sc.c_str());
+                                a->setShortcut(QKeySequence(qsc));
+                                break;
+                            }
                             QKeySequence s(m->shortCut);
                             a->setShortcut(s);
                         }
@@ -596,6 +648,372 @@
 
     return true;
 }
+
+/**
+    \fn buildActionLists
+*/
+void MainWindow::buildActionLists(void)
+{
+    ActionsAvailableWhenFileLoaded.clear();
+    ActionsDisabledOnPlayback.clear();
+    ActionsAlwaysAvailable.clear();
+
+    // Make a list of the items that are enabled/disabled depending if video is loaded or  not
+    //-----------------------------------------------------------------------------------
+    for(int i=1;i<6;i++)
+        ActionsAvailableWhenFileLoaded.push_back(ui.menuFile->actions().at(i));        
+
+    ActionsAvailableWhenFileLoaded.push_back(ui.menuFile->actions().at(2)); // "Save"
+    ActionsAvailableWhenFileLoaded.push_back(ui.menuFile->actions().at(9)); // "Information"
+
+    for(int i=3;i<11;i++)
+    {
+        if(i==5 || i==7 || i==11 || i==13) continue;
+        ActionsAvailableWhenFileLoaded.push_back(ui.menuEdit->actions().at(i));
+    }
+
+    for(int i=1;i<ui.menuView->actions().size();i++)
+    { // disable zoom if no video is loaded
+        ActionsAvailableWhenFileLoaded.push_back(ui.menuView->actions().at(i));
+    }
+
+    for(int i=2;i<ui.toolBar->actions().size();i++)
+    { // disable "Save" and "Information" buttons in the toolbar if no video is loaded
+        ActionsAvailableWhenFileLoaded.push_back(ui.toolBar->actions().at(i));
+    }
+
+#define PUSH_FULL_MENU_LOADED(x,tailOffset) for(int i=0;i<ui.x->actions().size()-tailOffset;i++)    ActionsAvailableWhenFileLoaded.push_back(ui.x->actions().at(i));
+#define PUSH_FULL_MENU_PLAYBACK(x,tailOffset) for(int i=0;i<ui.x->actions().size()-tailOffset;i++)    ActionsDisabledOnPlayback.push_back(ui.x->actions().at(i));
+
+    PUSH_FULL_MENU_LOADED(menuVideo,0)
+    PUSH_FULL_MENU_LOADED(menuAudio,0)
+    PUSH_FULL_MENU_LOADED(menuAuto,0)
+    PUSH_FULL_MENU_LOADED(menuGo,0)
+
+    // Item disabled on playback
+    for(int i=1;i<ui.menuView->actions().size();i++)
+    { // allow hiding widgets during playback
+        ActionsDisabledOnPlayback.push_back(ui.menuView->actions().at(i));
+    }
+
+    for(int i=1;i<ui.menuGo->actions().size();i++)
+    { // let "Play/Stop" stay enabled during playback
+        ActionsDisabledOnPlayback.push_back(ui.menuGo->actions().at(i));
+    }
+
+    PUSH_FULL_MENU_PLAYBACK(menuFile,1)
+    PUSH_FULL_MENU_PLAYBACK(menuEdit,0)
+    PUSH_FULL_MENU_PLAYBACK(menuVideo,0)
+    PUSH_FULL_MENU_PLAYBACK(menuAudio,0)
+    PUSH_FULL_MENU_PLAYBACK(menuAuto,0)
+    PUSH_FULL_MENU_PLAYBACK(menuHelp,0)
+    PUSH_FULL_MENU_PLAYBACK(toolBar,0)
+
+    if(recentFiles)
+        for(int i=0;i<recentFiles->actions().size();i++)
+            ActionsDisabledOnPlayback.push_back(recentFiles->actions().at(i));
+    if(recentProjects)
+        for(int i=0;i<recentProjects->actions().size();i++)

avidemux_2.6.18.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.h -> avidemux_2.6.19.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2.h Changed

@@ -17,6 +17,7 @@
 #include "myOwnMenu.h"
 #include "IScriptEngine.h"
 #include "prefs.h"
+#include "avi_vars.h"
 
 #define ENABLE_EVENT_FILTER
 
@@ -94,6 +95,8 @@
 	void buildCustomMenu(void);
 	void buildRecentMenu(void);
 	void buildRecentProjectMenu(void);
+	void updateActionShortcuts(void);
+        void volumeWidgetOperational(void);
         static void updateCheckDone(int version, const std::string &date, const std::string &downloadLink);
         static MainWindow *mainWindowSingleton;
 
@@ -110,13 +113,27 @@
     bool     refreshCapEnabled;
     uint32_t refreshCapValue;
 
+    std::vector<QAction *>ActionsAvailableWhenFileLoaded;
+    std::vector<QAction *>ActionsDisabledOnPlayback;
+    std::vector<QAction *>ActionsAlwaysAvailable;
+    std::vector<QToolButton *>ButtonsAvailableWhenFileLoaded;
+    std::vector<QToolButton *>ButtonsDisabledOnPlayback;
+    std::vector<QPushButton *>PushButtonsAvailableWhenFileLoaded;
+    std::vector<QPushButton *>PushButtonsDisabledOnPlayback;
 
 public slots:
         void updateAvailableSlot(int version, std::string date, std::string url);
         void dragTimerTimeout(void);
         void actionSlot(Action a)
         {
+            if(a==ACT_PlayAvi) // ugly
+            {
+                playing=1-playing;
+                setMenuItemsEnabledState();
+                playing=1-playing;
+            }
             HandleAction(a);
+            setMenuItemsEnabledState();
         }
         void sendAction(Action a)
         {
@@ -127,6 +144,7 @@
         void checkChanged(int);
 	void buttonPressed(void);
 	void toolButtonPressed(bool z);
+	void setMenuItemsEnabledState(void);
 
 	void comboChanged(int z);
 	void sliderValueChanged(int u);
@@ -182,6 +200,9 @@
         bool buildMyMenu(void);
         bool buildMenu(QMenu *root,MenuEntry *menu, int nb);
 	void buildRecentMenu(QMenu *menu,std::vector<std::string>files, QAction **actions);
+        void buildActionLists(void);
+        void buildButtonLists(void);
+        void widgetsUpdateTooltips(void);
         void searchMenu(QAction * action,MenuEntry *menu, int nb);
 	void searchRecentFiles(QAction *action, QAction **actionList, int firstEventId);
 #ifdef   ENABLE_EVENT_FILTER      
@@ -191,5 +212,6 @@
 	void dragEnterEvent(QDragEnterEvent *event);
 	void dropEvent(QDropEvent *event);
 	void openFiles(QList<QUrl>);
+        void changeEvent(QEvent* event);
 };
 #endif	// Q_gui2_h

avidemux_2.6.18.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2GL.cpp -> avidemux_2.6.19.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2GL.cpp Changed

avidemux_2.6.18.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp -> avidemux_2.6.19.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp Changed

avidemux_2.6.18.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_preview.cpp -> avidemux_2.6.19.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_preview.cpp Changed

avidemux_2.6.18.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/file_qt4.cpp -> avidemux_2.6.19.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/file_qt4.cpp Changed

@@ -47,16 +47,20 @@
         extSize+=strlen(ext);
     }
     //printf("Do filer=%d\n",(int)doFilter);
+    bool lastReadAsTarget=false;
+    prefs->get(FEATURES_USE_LAST_READ_DIR_AS_TARGET,&lastReadAsTarget);
     std::string lastFolder;
-    admCoreUtils::getLastWriteFolder(lastFolder);
+    if(!lastReadAsTarget)
+        admCoreUtils::getLastWriteFolder(lastFolder);
+    if(!lastFolder.size() || lastReadAsTarget)
+        admCoreUtils::getLastReadFolder(lastFolder);
     if (lastFolder.size())
     {
         QString outputPath = QFileInfo(QString::fromUtf8(lastFolder.c_str())).path();
 
-        char *tmpinputname = NULL;
         QString inputBaseName = QString("");
         std::string lastRead;
-        admCoreUtils::getLastReadFolder(lastRead);
+        admCoreUtils::getLastReadFile(lastRead);
         if (lastRead.size())
         {
             inputBaseName = QFileInfo(QString::fromUtf8(lastRead.c_str())).completeBaseName();
@@ -72,7 +76,15 @@
 
         /* LASTDIR may have gone; then do nothing and use current dir instead (implied) */
         if (!QDir(outputPath).exists())
+        {
                 str.clear();
+        }else
+        {
+            if(str==QString::fromUtf8(lastRead.c_str()))
+            { // try to avoid name collision when saving in the same directory as the currently loaded video
+                str = outputPath+separator+inputBaseName+QString("_edit")+outputExt;
+            }
+        }
     }
 
     if(doFilter)

avidemux_2.6.18.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/gui2.ui -> avidemux_2.6.19.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/gui2.ui Changed

@@ -112,6 +112,9 @@
      <height>30</height>
     </rect>
    </property>
+   <property name="contextMenuPolicy">
+    <enum>Qt::PreventContextMenu</enum>
+   </property>
    <widget class="QMenu" name="menuHelp">
     <property name="title">
      <string>&amp;Help</string>
@@ -194,6 +197,9 @@
    <property name="orientation">
     <enum>Qt::Horizontal</enum>
    </property>
+   <property name="contextMenuPolicy">
+    <enum>Qt::PreventContextMenu</enum>
+   </property>
    <attribute name="toolBarArea">
     <enum>TopToolBarArea</enum>
    </attribute>
@@ -249,7 +255,7 @@
        <item>
         <widget class="QLabel" name="label_7">
          <property name="text">
-          <string>&lt;b&gt;Video Decoder&lt;b&gt;</string>
+          <string>&lt;b&gt;Video Decoder&lt;/b&gt;</string>
          </property>
         </widget>
        </item>
@@ -986,29 +992,6 @@
           </widget>
          </item>
          <item>
-          <widget class="QToolButton" name="toolButtonStop">
-           <property name="toolTip">
-            <string>Stop [SPACE]</string>
-           </property>
-           <property name="text">
-            <string>...</string>
-           </property>
-           <property name="icon">
-            <iconset resource="avidemux.qrc">
-             <normaloff>:/new/prefix1/pics/player_stop.png</normaloff>:/new/prefix1/pics/player_stop.png</iconset>
-           </property>
-           <property name="iconSize">
-            <size>
-             <width>24</width>
-             <height>24</height>
-            </size>
-           </property>
-           <property name="autoRaise">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
           <widget class="QToolButton" name="toolButtonPreviousFrame">
            <property name="toolTip">
             <string>Go to previous frame [LEFT]</string>

avidemux_2.6.18.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/translation_table.h -> avidemux_2.6.19.tar.gz/avidemux/qt4/ADM_userInterfaces/ADM_gui/translation_table.h Changed

avidemux_2.6.18.tar.gz/avidemux/qt4/CMakeLists.txt -> avidemux_2.6.19.tar.gz/avidemux/qt4/CMakeLists.txt Changed

avidemux_2.6.18.tar.gz/avidemux/qt4/i18n/avidemux.pro -> avidemux_2.6.19.tar.gz/avidemux/qt4/i18n/avidemux.pro Changed

@@ -19,6 +19,7 @@
 ../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmxPacket.h \ 
 ../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmx_demuxer.h \ 
 ../../../avidemux_core/ADM_coreDemuxerMpeg/include/ADM_indexFile.h \ 
+../../../avidemux_core/ADM_coreDemuxerMpeg/include/ADM_coreDemuxerMpeg6_export.h \ 
 ../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmx_demuxerPS.h \ 
 ../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmx_io.h \ 
 ../../../avidemux_core/ADM_coreDemuxerMpeg/include/dmx_demuxerEs.h \ 
@@ -75,7 +76,6 @@
 ../../../avidemux_core/ADM_coreVideoFilter/include/ADM_videoFilterCache.h \ 
 ../../../avidemux_core/ADM_coreVideoFilter/include/ADM_coreVideoFilterInternal.h \ 
 ../../../avidemux_core/ADM_coreVideoFilter/include/ADM_coreVideoFilterFunc.h \ 
-../../../avidemux_core/ADM_coreVideoFilter/include/DIA_flyDialog.h \ 
 ../../../avidemux_core/ADM_coreVideoFilter/include/ADM_filterCategory.h \ 
 ../../../avidemux_core/ADM_coreVideoFilter/include/ADM_videoFilterBridge.h \ 
 ../../../avidemux_core/ADM_coreSqlLight3/include/Query.h \ 
@@ -86,6 +86,8 @@
 ../../../avidemux_core/ADM_coreSqlLight3/include/ADM_coreSqlLight3_export.h \ 
 ../../../avidemux_core/ADM_coreSqlLight3/include/Database.h \ 
 ../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreDxva2/include/ADM_coreDxva2.h \ 
+../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreDxva2/include/ADM_coreDxva2_export.h \ 
+../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreDxva2/include/ADM_coreD3D.h \ 
 ../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/include/ADM_coreVdpauInternal.h \ 
 ../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/include/ADM_coreVdpau.h \ 
 ../../../avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreXvba/include/fglrxinfo.h \ 
@@ -190,25 +192,28 @@
 ../../../avidemux_core/ADM_coreUtils/src/prefs2_pref.h \ 
 ../../../avidemux_core/ADM_coreUtils/src/prefs2.h \ 
 ../../../avidemux_core/ADM_coreUtils/src/libjson.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONStats.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONMemoryPool.h \ 
 ../../../avidemux_core/ADM_coreUtils/src/Source/NumberToString.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONSharedString.h \ 
 ../../../avidemux_core/ADM_coreUtils/src/Source/JSONDefs.h \ 
 ../../../avidemux_core/ADM_coreUtils/src/Source/JSONNode.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONAllocator.h \ 
 ../../../avidemux_core/ADM_coreUtils/src/Source/JSONStream.h \ 
 ../../../avidemux_core/ADM_coreUtils/src/Source/JSONMemory.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONPreparse.h \ 
 ../../../avidemux_core/ADM_coreUtils/src/Source/JSON_Base64.h \ 
 ../../../avidemux_core/ADM_coreUtils/src/Source/internalJSONNode.h \ 
 ../../../avidemux_core/ADM_coreUtils/src/Source/JSONWorker.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONSingleton.h \ 
 ../../../avidemux_core/ADM_coreUtils/src/Source/JSONValidator.h \ 
 ../../../avidemux_core/ADM_coreUtils/src/Source/JSONChildren.h \ 
 ../../../avidemux_core/ADM_coreUtils/src/Source/JSONDebug.h \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONDefs/._Visual_C.h \ 
 ../../../avidemux_core/ADM_coreUtils/src/Source/JSONDefs/Strings_Defs.h \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONDefs/._GNU_C.h \ 
 ../../../avidemux_core/ADM_coreUtils/src/Source/JSONDefs/GNU_C.h \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONDefs/._Unknown_C.h \ 
 ../../../avidemux_core/ADM_coreUtils/src/Source/JSONDefs/Unknown_C.h \ 
-../../../avidemux_core/ADM_coreUtils/src/Source/JSONDefs/._Strings_Defs.h \ 
 ../../../avidemux_core/ADM_coreUtils/src/Source/JSONDefs/Visual_C.h \ 
+../../../avidemux_core/ADM_coreUtils/src/Source/JSONGlobals.h \ 
 ../../../avidemux_core/ADM_coreUtils/src/JSONOptions.h \ 
 ../../../avidemux_core/ADM_coreUtils/include/ADM_threadQueue.h \ 
 ../../../avidemux_core/ADM_coreUtils/include/ADM_string.h \ 
@@ -237,6 +242,7 @@
 ../../../avidemux_core/ADM_coreUtils/include/ADM_getbits.h \ 
 ../../../avidemux_core/ADM_coreUtils/include/ADM_videoInfoExtractor.h \ 
 ../../../avidemux_core/ADM_coreImageLoader/include/ADM_imageLoader.h \ 
+../../../avidemux_core/ADM_coreImageLoader/include/ADM_coreImageLoader6_export.h \ 
 ../../../avidemux_core/ADM_coreSubtitles/include/ADM_coreSubtitles.h \ 
 ../../../avidemux_core/ADM_coreSocket/include/ADM_coreCommandSocket.h \ 
 ../../../avidemux_core/ADM_coreSocket/include/ADM_coreAvsProtocol.h \ 
@@ -260,6 +266,7 @@
 ../../../avidemux_core/ADM_coreAudioFilter/include/audiofilter.h \ 
 ../../../avidemux_core/ADM_coreAudioFilter/include/audioEncoderApi.h \ 
 ../../../avidemux/qt4/ADM_openGL/include/ADM_openGl.h \ 
+../../../avidemux/qt4/ADM_openGL/include/ADM_openGL_export.h \ 
 ../../../avidemux/qt4/ADM_update/private_inc/ADM_updateImpl.h \ 
 ../../../avidemux/qt4/ADM_update/include/ADM_update.h \ 
 ../../../avidemux/qt4/ADM_jobs/include/T_progress.h \ 
@@ -408,8 +415,8 @@
 ../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/logo/qt4/DIA_flyLogo.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/logo/ADM_vidLogo.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/crop/DIA_flyCrop.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/crop/crop.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/DIA_flyCrop.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/crop/qt4/Q_crop.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3Dlow.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/ADM_vidMPLD3D.h \ 
@@ -417,6 +424,8 @@
 ../../../avidemux_plugins/ADM_videoFilters6/mplayerDenoise3D/denoise3dHQ.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/blackenBorder.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/Q_blackenBorders.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/DIA_flyBlackenBorders.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/asciiView/ascii_font.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/rotate/rte.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/black/black.h \ 
@@ -424,11 +433,12 @@
 ../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/colorYUV/ADM_vidColorYuv_param.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/resampleFps/confResampleFps.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/vaapiFilters/vaapiFilter.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/largeMedian/ADM_largeMedian.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/largeMedian/convolution.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/removePlane/rplane.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/eq2/DIA_flyEq2.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/eq2/eq2.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/DIA_flyEq2.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/eq2/ADM_vidEq2.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/decimate/decimate.h \ 
@@ -440,9 +450,11 @@
 ../../../avidemux_plugins/ADM_videoFilters6/dgBob/dgBob.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/vdpauFilterDeint.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/vdpauFilters/vdpauFilter.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/DIA_flyMpDelogo.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/Q_mpdelogo.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/delogo.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/Q_mpdelogo.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt4/DIA_flyMpDelogo.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/mplayerDelogo/ADM_vidMPdelogo.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/resize/qt4/Q_resize.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/resize/swresize.h \ 
@@ -464,7 +476,7 @@
 ../../../avidemux_plugins/ADM_videoFilters6/asharp/qt4/Q_asharp.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/asharp/DIA_flyAsharp.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/asharp/asharp.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/hue/DIA_flyHue.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/hue/qt4/DIA_flyHue.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/hue/qt4/Q_hue.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/hue/hue.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/chromaShift/DIA_flyChromaShift.h \ 
@@ -473,6 +485,9 @@
 ../../../avidemux_plugins/ADM_videoFilters6/chromaShift/ADM_vidChromaShift_param.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/chromaShift/chromashift.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/mSharpen/msharpen.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/Q_msharpen.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/DIA_flymsharpen.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/addBorder/addBorder.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/addBorder/ADM_vidAddBorder.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/fadeTo/fade.h \ 
@@ -496,7 +511,7 @@
 ../../../avidemux_plugins/ADM_videoFilters6/ass/ADM_libass/ass_types.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/changeFps/confChangeFps.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/contrast/contrast.h \ 
-../../../avidemux_plugins/ADM_videoFilters6/contrast/DIA_flyContrast.h \ 
+../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/DIA_flyContrast.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.h \ 
 ../../../avidemux_plugins/ADM_videoFilters6/contrast/ADM_vidContrast.h \ 
 ../../../avidemux_plugins/ADM_videoDecoder/vpx/ADM_vpx.h \ 
@@ -524,6 +539,8 @@
 ../../../avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.h \ 
 ../../../avidemux_plugins/ADM_videoEncoder/x265/qt4/Q_x265.h \ 
 ../../../avidemux_plugins/ADM_videoEncoder/x265/x265_settings.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ffnvenc.h \ 
+../../../avidemux_plugins/ADM_videoEncoder/ffNvEncHEVC/ADM_ffNvEnc.h \ 
 ../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/mpegMatrix.h \ 
 ../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/ADM_ffMpeg2.h \ 
 ../../../avidemux_plugins/ADM_videoEncoder/ffMpeg2/mpeg2_encoder.h \ 
@@ -727,12 +744,8 @@
 ../../../avidemux_plugins/ADM_audioEncoders/lame/lame_encoder.h \ 
 ../../../avidemux_plugins/ADM_audioEncoders/vorbis/vorbis_encoder.h \ 
 ../../../avidemux_plugins/ADM_audioEncoders/vorbis/audioencoder_vorbis.h \ 
-../../../avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_ac3.h \ 
 ../../../avidemux_plugins/ADM_audioEncoders/lavcodec/lavcodec_encoder.h \ 
-../../../avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_dts.h \ 
 ../../../avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.h \ 
-../../../avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_aac.h \ 
-../../../avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_mp2.h \ 
 ../../../avidemux_plugins/ADM_audioEncoders/pcm/audioencoder_pcm.h \ 
 ../../../avidemux_plugins/ADM_audioEncoders/dcaenc/dcaencoder.h \ 
 ../../../avidemux_plugins/ADM_audioEncoders/dcaenc/audioencoder_dcaenc.h \ 
@@ -750,25 +763,29 @@
 ../../../avidemux_core/ADM_coreDemuxerMpeg/src/dmxPacket.cpp \ 
 ../../../avidemux_core/ADM_core/src/ADM_nvwa/debug_new.cpp \ 
 ../../../avidemux_core/ADM_core/src/ADM_nvwa/addr2line.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_crashdump_vs.cpp \ 
 ../../../avidemux_core/ADM_core/src/ADM_threads.cpp \ 
 ../../../avidemux_core/ADM_core/src/ADM_fileio.cpp \ 
 ../../../avidemux_core/ADM_core/src/ADM_folder_mac.cpp \ 
 ../../../avidemux_core/ADM_core/src/ADM_crashdump_unix.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_win32_mingw.cpp \ 
 ../../../avidemux_core/ADM_core/src/ADM_folder_win32.cpp \ 
 ../../../avidemux_core/ADM_core/src/ADM_memcpy.cpp \ 
 ../../../avidemux_core/ADM_core/src/ADM_dynamicLoading.cpp \ 
 ../../../avidemux_core/ADM_core/src/ADM_memsupport.cpp \ 
 ../../../avidemux_core/ADM_core/src/ADM_win32.cpp \ 
 ../../../avidemux_core/ADM_core/src/ADM_folder_unix.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_folder_mingw.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_folder_vs.cpp \ 
 ../../../avidemux_core/ADM_core/src/ADM_misc.cpp \ 
 ../../../avidemux_core/ADM_core/src/ADM_debug.cpp \ 
 ../../../avidemux_core/ADM_core/src/ADM_coreTranslator.cpp \ 
 ../../../avidemux_core/ADM_core/src/ADM_crashdump_other.cpp \ 
 ../../../avidemux_core/ADM_core/src/ADM_prettyPrint.cpp \ 
 ../../../avidemux_core/ADM_core/src/ADM_benchmark.cpp \ 
+../../../avidemux_core/ADM_core/src/ADM_win32_vs.cpp \ 
 ../../../avidemux_core/ADM_core/src/ADM_folder_linux.cpp \ 
 ../../../avidemux_core/ADM_core/src/ADM_crashdump_mingw.cpp \ 
-../../../avidemux_core/ADM_core/src/dirent.c \ 
 ../../../avidemux_core/ADM_core/src/ADM_crashdump_apple.cpp \ 
 ../../../avidemux_core/ADM_core/src/TLK_clock.cpp \

avidemux_2.6.18.tar.gz/avidemux/qt4/i18n/avidemux_ca.ts -> avidemux_2.6.19.tar.gz/avidemux/qt4/i18n/avidemux_ca.ts Changed

@@ -3735,7 +3735,7 @@
         <translation type="obsolete">Potser es refereix a un fitxer d&apos;índex antic.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+222"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+229"/>
         <source>Attempt to open %s failed!</source>
         <translation type="unfinished">Ha fallat l&apos;intent d&apos;obrir %s!</translation>
     </message>
@@ -5412,7 +5412,7 @@
         <translation type="obsolete">&lt;b&gt;Vídeo&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+462"/>
+        <location line="+468"/>
         <location line="+169"/>
         <source>Copy</source>
         <translation type="unfinished">Copiat</translation>
@@ -5426,7 +5426,12 @@
         <translation type="unfinished">Configura</translation>
     </message>
     <message>
-        <location line="-334"/>
+        <location line="-592"/>
+        <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+258"/>
         <location line="+169"/>
         <source>Filters</source>
         <translation type="unfinished">Filtres</translation>
@@ -5452,14 +5457,13 @@
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
-        <location line="+23"/>
         <location line="+26"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+26"/>
-        <location line="+352"/>
+        <location line="+345"/>
         <source>...</source>
         <translation type="unfinished">...</translation>
     </message>
@@ -5476,12 +5480,12 @@
         <translation type="obsolete">/ 0</translation>
     </message>
     <message>
-        <location line="-297"/>
+        <location line="-290"/>
         <source>Time:</source>
         <translation type="unfinished">Temps:</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+18"/>
         <source>00:00:00.000</source>
         <translation type="unfinished">00:00:00.000</translation>
     </message>
@@ -5504,13 +5508,13 @@
         <translation type="obsolete">Selecció</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+128"/>
         <location line="+10"/>
         <source>000000</source>
         <translation type="unfinished">000000</translation>
     </message>
     <message>
-        <location line="-1441"/>
+        <location line="-1414"/>
         <source>&amp;Help</source>
         <translation type="unfinished">Aj&amp;uda</translation>
     </message>
@@ -5571,7 +5575,7 @@
         <translation type="obsolete">Au&amp;to</translation>
     </message>
     <message>
-        <location line="+1583"/>
+        <location line="+1540"/>
         <source>&amp;Open...</source>
         <translation type="unfinished">&amp;Obre</translation>
     </message>
@@ -6087,12 +6091,12 @@
         <translation type="obsolete">Ctrl+W</translation>
     </message>
     <message>
-        <location line="-1184"/>
+        <location line="-1138"/>
         <source>ms</source>
         <translation type="unfinished">ms</translation>
     </message>
     <message>
-        <location line="+793"/>
+        <location line="+763"/>
         <source>A:</source>
         <translation type="unfinished">A:</translation>
     </message>
@@ -6170,12 +6174,12 @@
         <translation type="obsolete">Video CD</translation>
     </message>
     <message>
-        <location line="-137"/>
+        <location line="-131"/>
         <source>Frame type:</source>
         <translation type="unfinished">Tipus fotograma: </translation>
     </message>
     <message>
-        <location line="-1265"/>
+        <location line="-1244"/>
         <source>&amp;Toolbars</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6190,17 +6194,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+44"/>
         <source>Codec O&amp;ptions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;b&gt;Video Decoder&lt;b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+108"/>
         <location line="+7"/>
         <source>XXXX</source>
         <translation type="unfinished"></translation>
@@ -6227,12 +6226,12 @@
     </message>
     <message>
         <location line="+114"/>
-        <location line="+978"/>
+        <location line="+932"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-903"/>
+        <location line="-857"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6243,11 +6242,6 @@
     </message>
     <message>
         <location line="+26"/>
-        <source>Stop [SPACE]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+23"/>
         <source>Go to previous frame [LEFT]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6312,7 +6306,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+185"/>
+        <location line="+178"/>
         <source>Se&amp;lection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6342,7 +6336,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+84"/>
         <source>Audio &amp;Metre</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7594,17 +7588,16 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+210"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+217"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>_Use systray while encoding</source>
-        <translation type="unfinished">_Usa la safata de sistema en codificar</translation>
+        <translation type="obsolete">_Usa la safata de sistema en codificar</translation>
     </message>
     <message>
-        <location line="+1"/>

avidemux_2.6.18.tar.gz/avidemux/qt4/i18n/avidemux_cs.ts -> avidemux_2.6.19.tar.gz/avidemux/qt4/i18n/avidemux_cs.ts Changed

@@ -7579,7 +7579,7 @@
         <translation type="obsolete">Může to být starým indexovým souborem.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+222"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+229"/>
         <source>Attempt to open %s failed!</source>
         <translation type="unfinished">Selhalo otevření %s!</translation>
     </message>
@@ -10082,7 +10082,7 @@
         <translation type="obsolete">&lt;b&gt;Video&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+462"/>
+        <location line="+468"/>
         <location line="+169"/>
         <source>Copy</source>
         <translation type="unfinished">Kopie</translation>
@@ -10122,14 +10122,13 @@
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
-        <location line="+23"/>
         <location line="+26"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+26"/>
-        <location line="+352"/>
+        <location line="+345"/>
         <source>...</source>
         <translation type="unfinished">...</translation>
     </message>
@@ -10146,12 +10145,12 @@
         <translation type="obsolete">/ 0</translation>
     </message>
     <message>
-        <location line="-297"/>
+        <location line="-290"/>
         <source>Time:</source>
         <translation type="unfinished">Čas:</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+18"/>
         <source>00:00:00.000</source>
         <translation type="unfinished">00:00:00.000</translation>
     </message>
@@ -10174,13 +10173,13 @@
         <translation type="obsolete">Výběr</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+128"/>
         <location line="+10"/>
         <source>000000</source>
         <translation type="unfinished">000000</translation>
     </message>
     <message>
-        <location line="-1441"/>
+        <location line="-1414"/>
         <source>&amp;Help</source>
         <translation type="unfinished">Náp&amp;ověda</translation>
     </message>
@@ -10241,7 +10240,7 @@
         <translation type="obsolete">Au&amp;to</translation>
     </message>
     <message>
-        <location line="+1583"/>
+        <location line="+1540"/>
         <source>&amp;Open...</source>
         <translation type="unfinished">&amp;Otevřít...</translation>
     </message>
@@ -10661,17 +10660,22 @@
         <translation type="unfinished">&amp;Na sebe</translation>
     </message>
     <message>
-        <location line="-533"/>
+        <location line="-1636"/>
+        <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1125"/>
         <source>Frame type:</source>
         <translation type="unfinished">Typ snímku:</translation>
     </message>
     <message>
-        <location line="+521"/>
+        <location line="+499"/>
         <source>&amp;Separate</source>
         <translation type="unfinished">S&amp;amostatně</translation>
     </message>
     <message>
-        <location line="-1184"/>
+        <location line="-1138"/>
         <source>ms</source>
         <translation type="unfinished">ms</translation>
     </message>
@@ -10684,7 +10688,7 @@
         <translation type="obsolete">Uložit výběr jako JPEG obrázky...</translation>
     </message>
     <message>
-        <location line="+793"/>
+        <location line="+763"/>
         <source>A:</source>
         <translation type="unfinished">A:</translation>
     </message>
@@ -10754,7 +10758,7 @@
         <translation type="obsolete">Video CD</translation>
     </message>
     <message>
-        <location line="-1402"/>
+        <location line="-1375"/>
         <source>&amp;Toolbars</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10769,17 +10773,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+44"/>
         <source>Codec O&amp;ptions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;b&gt;Video Decoder&lt;b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+108"/>
         <location line="+7"/>
         <source>XXXX</source>
         <translation type="unfinished"></translation>
@@ -10806,12 +10805,12 @@
     </message>
     <message>
         <location line="+114"/>
-        <location line="+978"/>
+        <location line="+932"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-903"/>
+        <location line="-857"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10822,11 +10821,6 @@
     </message>
     <message>
         <location line="+26"/>
-        <source>Stop [SPACE]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+23"/>
         <source>Go to previous frame [LEFT]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10891,7 +10885,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+185"/>
+        <location line="+178"/>
         <source>Se&amp;lection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10921,7 +10915,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+84"/>
         <source>Audio &amp;Metre</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12218,17 +12212,16 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+210"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+217"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>_Use systray while encoding</source>
-        <translation type="unfinished">_Pohltit do panelu při kódování</translation>
+        <translation type="obsolete">_Pohltit do panelu při kódování</translation>
     </message>
     <message>
-        <location line="+1"/>

avidemux_2.6.18.tar.gz/avidemux/qt4/i18n/avidemux_da.ts -> avidemux_2.6.19.tar.gz/avidemux/qt4/i18n/avidemux_da.ts Changed

@@ -21,7 +21,7 @@
 Drop timinginformationer?</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+186"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+193"/>
         <source>Cannot find a demuxer for %s</source>
         <translation>Kan ikke finde en demuxer for %s</translation>
     </message>
@@ -31,139 +31,18 @@
         <translation>Forsøg på at åbne %s fejlede!</translation>
     </message>
     <message>
-        <source>You cannot mix different video dimensions yet. Using the partial video filter later, will not work around this problem. The workaround is:
-1.) &quot;resize&quot; / &quot;add border&quot; / &quot;crop&quot; each stream to the same resolution
-2.) concatinate them together</source>
-        <translation type="vanished">Du kan endnu ikke mikse forskellige videodimensioner. Det vil ikke løse problemet at bruge det delvise videofilter senere. Det kan gøres som her:
-1.) &quot;tilpas størrelse&quot;/&quot;tilføj kanter&quot;/&quot;beskær&quot; hver strøm til samme opløsning
-2.) sæt dem sammen</translation>
-    </message>
-    <message>
         <location line="+26"/>
         <source>You cannot mix different video dimensions yet. Using the partial video filter later, will not work around this problem. The workaround is:
 1.) &quot;resize&quot; / &quot;add border&quot; / &quot;crop&quot; each stream to the same resolution
 2.) concatenate them together</source>
-        <translation type="unfinished"></translation>
+        <translation>Du kan endnu ikke mikse forskellige videodimensioner. Det vil ikke løse problemet at bruge det delvise videofilter senere. Det kan gøres som her:
+1.) &quot;tilpas størrelse&quot;/&quot;tilføj kanter&quot;/&quot;beskær&quot; hver strøm til samme opløsning
+2.) sæt dem sammen</translation>
     </message>
     <message>
         <location filename="../../common/ADM_editor/src/utils/ADM_edCheckForInvalidPts.cpp" line="-18"/>
         <source>Checking if timestamps are valid..</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ADM_Qt4CoreUIToolkit</name>
-    <message>
-        <source>Alert</source>
-        <translation type="vanished">Besked</translation>
-    </message>
-    <message>
-        <source>Info</source>
-        <translation type="vanished">Info</translation>
-    </message>
-    <message>
-        <source>Confirmation</source>
-        <translation type="vanished">Bekræftelse</translation>
-    </message>
-    <message>
-        <source>Question</source>
-        <translation type="vanished">Spørgsmål</translation>
-    </message>
-    <message>
-        <source>Question?</source>
-        <translation type="vanished">Spørgsmål?</translation>
-    </message>
-</context>
-<context>
-    <name>ADM_Qt4Factory::ADM_Qbitrate</name>
-    <message>
-        <source>Constant Bitrate</source>
-        <translation type="vanished">Konstant bithastighed</translation>
-    </message>
-    <message>
-        <source>Constant Quantiser</source>
-        <translation type="vanished">Konstant quantiser</translation>
-    </message>
-    <message>
-        <source>Same Quantiser as Input</source>
-        <translation type="vanished">Samme quantiser som input</translation>
-    </message>
-    <message>
-        <source>Constant Rate Factor</source>
-        <translation type="vanished">Konstant ratefaktor</translation>
-    </message>
-    <message>
-        <source>Two Pass - Video Size</source>
-        <translation type="vanished">To gennemløb - videostørrelse</translation>
-    </message>
-    <message>
-        <source>Two Pass - Average Bitrate</source>
-        <translation type="vanished">To gennemløb - gennemsnitlig bithastighed</translation>
-    </message>
-    <message>
-        <source>Encoding mode</source>
-        <translation type="vanished">Kodningstilstand</translation>
-    </message>
-    <message>
-        <source>Bitrate</source>
-        <translation type="vanished">Bithastighed</translation>
-    </message>
-    <message>
-        <source>Target bitrate (kb/s)</source>
-        <translation type="vanished">Ønsket bithastighed (Kb/s/KB/s)</translation>
-    </message>
-    <message>
-        <source>Quantizer</source>
-        <translation type="vanished">Quantiser</translation>
-    </message>
-    <message>
-        <source>Target video size (MB)</source>
-        <translation type="vanished">Ønsket videostørrelse (MB)</translation>
-    </message>
-    <message>
-        <source>Average bitrate (kb/s)</source>
-        <translation type="vanished">Gennemsnitlig bithastighed (Kb/s/KB/s)</translation>
-    </message>
-    <message>
-        <source>-</source>
-        <translation type="vanished">-</translation>
-    </message>
-</context>
-<context>
-    <name>ADM_QthreadCount</name>
-    <message>
-        <source>Disabled</source>
-        <translation type="obsolete">Deaktiveret</translation>
-    </message>
-    <message>
-        <source>Auto-detect</source>
-        <translation type="obsolete">Automatisk registrering</translation>
-    </message>
-    <message>
-        <source>Custom</source>
-        <translation type="obsolete">Brugerdefineret</translation>
-    </message>
-</context>
-<context>
-    <name>ADM_qt4Factory::ADM_QthreadCount</name>
-    <message>
-        <source>Disabled</source>
-        <translation type="vanished">Deaktiveret</translation>
-    </message>
-    <message>
-        <source>Auto-detect</source>
-        <translation type="vanished">Automatisk registrering</translation>
-    </message>
-    <message>
-        <source>Custom</source>
-        <translation type="vanished">Brugerdefineret</translation>
-    </message>
-</context>
-<context>
-    <name>ADM_qtray</name>
-    <message>
-        <source>Open Avidemux</source>
-        <translation type="vanished">Åbn Avidemux</translation>
+        <translation>Tjekker om tidsstempler er gyldige..</translation>
     </message>
 </context>
 <context>
@@ -325,26 +204,7 @@
     <message>
         <location line="+7"/>
         <source>Cancel</source>
-        <translation>Annullér</translation>
-    </message>
-</context>
-<context>
-    <name>DIA_encodingQt4</name>
-    <message>
-        <source>Shutting down</source>
-        <translation type="vanished">Lukker ned</translation>
-    </message>
-    <message>
-        <source>The encoding is paused. Do you want to resume or abort?</source>
-        <translation type="vanished">Kodningen er sat på pause. Vil du genoptage eller afbryde?</translation>
-    </message>
-    <message>
-        <source>Resume</source>
-        <translation type="vanished">Genoptag</translation>
-    </message>
-    <message>
-        <source>Abort</source>
-        <translation type="vanished">Afbryd</translation>
+        <translation>Annuller</translation>
     </message>
 </context>
 <context>
@@ -394,10 +254,6 @@
         <translation>Konfigurér</translation>
     </message>
     <message>
-        <source>Audio Filters</source>
-        <translation type="vanished">Lydfiltre</translation>
-    </message>
-    <message>
         <location line="-105"/>
         <source>Track 2</source>
         <translation>Spor 2</translation>
@@ -418,7 +274,7 @@
         <location line="+41"/>
         <location line="+41"/>
         <source>Filters</source>
-        <translation type="unfinished">Filtre</translation>
+        <translation>Filtre</translation>
     </message>
 </context>

avidemux_2.6.18.tar.gz/avidemux/qt4/i18n/avidemux_de.ts -> avidemux_2.6.19.tar.gz/avidemux/qt4/i18n/avidemux_de.ts Changed

@@ -3441,7 +3441,7 @@
         <translation type="obsolete">Es bezieht sich vielleicht auf eine alte Index-Datei.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+222"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+229"/>
         <source>Attempt to open %s failed!</source>
         <translation type="unfinished">Versuch %s zu öffnen ist misslungen!</translation>
     </message>
@@ -5094,7 +5094,7 @@
         <translation type="obsolete">&lt;b&gt;Video-Spur&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+462"/>
+        <location line="+468"/>
         <location line="+169"/>
         <source>Copy</source>
         <translation type="unfinished">Kopieren</translation>
@@ -5134,14 +5134,13 @@
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
-        <location line="+23"/>
         <location line="+26"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+26"/>
-        <location line="+352"/>
+        <location line="+345"/>
         <source>...</source>
         <translation type="unfinished">...</translation>
     </message>
@@ -5158,7 +5157,7 @@
         <translation type="obsolete">/ 0</translation>
     </message>
     <message>
-        <location line="-297"/>
+        <location line="-290"/>
         <source>Time:</source>
         <translation type="unfinished">Zeit:</translation>
     </message>
@@ -5167,7 +5166,7 @@
         <translation type="obsolete">Bildtyp:</translation>
     </message>
     <message>
-        <location line="+83"/>
+        <location line="+82"/>
         <source>?</source>
         <translation type="unfinished">?</translation>
     </message>
@@ -5176,7 +5175,7 @@
         <translation type="obsolete">Auswahlbereich</translation>
     </message>
     <message>
-        <location line="-1297"/>
+        <location line="-1276"/>
         <source>&amp;Help</source>
         <translation type="unfinished">&amp;Hilfe</translation>
     </message>
@@ -5237,7 +5236,7 @@
         <translation type="obsolete">V&amp;orlagen</translation>
     </message>
     <message>
-        <location line="+1583"/>
+        <location line="+1540"/>
         <source>&amp;Open...</source>
         <translation type="unfinished">&amp;Öffnen...</translation>
     </message>
@@ -5321,7 +5320,7 @@
     <message>
         <location line="+3"/>
         <source>Alt+Return</source>
-        <translation type="unfinished">Alt+i</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
@@ -5535,12 +5534,12 @@
         <translation type="obsolete">ein Bild zu&amp;rück</translation>
     </message>
     <message>
-        <location line="-1075"/>
+        <location line="-1029"/>
         <source>ms</source>
         <translation type="unfinished">ms</translation>
     </message>
     <message>
-        <location line="+793"/>
+        <location line="+763"/>
         <source>A:</source>
         <translation type="unfinished">A:</translation>
     </message>
@@ -5754,7 +5753,7 @@
         <translation type="obsolete">Schriftzeichen bearbeiten</translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+274"/>
         <source>&amp;Input</source>
         <translation type="unfinished">&amp;Original</translation>
     </message>
@@ -5774,12 +5773,12 @@
         <translation type="unfinished">&amp;übereinander</translation>
     </message>
     <message>
-        <location line="-533"/>
+        <location line="-511"/>
         <source>Frame type:</source>
-        <translation type="unfinished">Bildtyp:</translation>
+        <translation>Frame-Typ:</translation>
     </message>
     <message>
-        <location line="+521"/>
+        <location line="+499"/>
         <source>&amp;Separate</source>
         <translation type="unfinished">&amp;eigenständig</translation>
     </message>
@@ -5804,7 +5803,7 @@
         <translation type="obsolete">Video CD</translation>
     </message>
     <message>
-        <location line="-1786"/>
+        <location line="-1743"/>
         <source>&amp;Toolbars</source>
         <translation type="unfinished">&amp;Werkzeugleisten</translation>
     </message>
@@ -5823,12 +5822,7 @@
         <translation type="obsolete">Codec-Einstellungen</translation>
     </message>
     <message>
-        <location line="+74"/>
-        <source>&lt;b&gt;Video Decoder&lt;b&gt;</source>
-        <translation type="unfinished">&lt;b&gt;Video-Decoder&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <location line="+139"/>
+        <location line="+216"/>
         <source>&lt;b&gt;Video Output&lt;/b&gt;</source>
         <translation type="unfinished">&lt;b&gt;Video-Codec&lt;/b&gt;</translation>
     </message>
@@ -5856,7 +5850,7 @@
         <translation type="obsolete">Pegelanzeige</translation>
     </message>
     <message>
-        <location line="+1078"/>
+        <location line="+1032"/>
         <source>&amp;Codec Options</source>
         <translation type="unfinished">&amp;Codec-Einstellungen</translation>
     </message>
@@ -5880,44 +5874,39 @@
         <translation type="obsolete">Filter bei Wiedergabe anwenden</translation>
     </message>
     <message>
-        <location line="-332"/>
+        <location line="-316"/>
         <source>Play filtered</source>
         <translation type="unfinished">Filter anwenden</translation>
     </message>
     <message>
-        <location line="+169"/>
+        <location line="+153"/>
         <source>Open Video</source>
         <translation type="unfinished">Videodatei öffnen</translation>
     </message>
     <message>
-        <location line="-782"/>
+        <location line="-736"/>
         <source>Play [SPACE]</source>
-        <translation>Wiedergabe/Pause [Leertaste]</translation>
+        <translation>Wiedergabe/Stopp [Leertaste]</translation>
     </message>
     <message>
         <location line="+29"/>
-        <source>Stop [SPACE]</source>
-        <translation>Stopp [Leertaste]</translation>
-    </message>
-    <message>
-        <location line="+23"/>
         <source>Go to previous frame [LEFT]</source>
-        <translation>Vorheriges Bild [Pfeiltaste links]</translation>
+        <translation>Ein Frame zurück [Pfeiltaste links]</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Go to next frame [RIGHT]</source>
-        <translation>Nächstes Bild [Pfeiltaste rechts]</translation>
+        <translation>Ein Frame vor [Pfeiltaste rechts]</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Go to previous keyframe [DOWN]</source>
-        <translation>Zum vorherigen Keyframe [Pfeiltaste runter]</translation>
+        <translation>Ein I-Frame zurück [Pfeiltaste runter]</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Go to next keyframe [UP]</source>
-        <translation>Zum nächsten Keyframe [Pfeiltaste hoch]</translation>

avidemux_2.6.18.tar.gz/avidemux/qt4/i18n/avidemux_el.ts -> avidemux_2.6.19.tar.gz/avidemux/qt4/i18n/avidemux_el.ts Changed

@@ -45,7 +45,7 @@
     </message>
     <message>
         <source>Automatically _build VBR map</source>
-        <translation type="obsolete">Αυτόματο χτίσιμο του χάρτη VBR</translation>
+        <translation type="obsolete">Αυτόματο _χτίσιμο του χάρτη VBR</translation>
     </message>
     <message>
         <source>SIMD</source>
@@ -97,11 +97,11 @@
     </message>
     <message>
         <source>Above normal</source>
-        <translation type="obsolete">Πάνω από το κανονικό</translation>
+        <translation type="obsolete">Πάνω από το Κανονικό</translation>
     </message>
     <message>
         <source>Below normal</source>
-        <translation type="obsolete">Κάτω από το κανονικό</translation>
+        <translation type="obsolete">Κάτω από το Κανονικό</translation>
     </message>
     <message>
         <source>Low</source>
@@ -249,11 +249,11 @@
     </message>
     <message>
         <source>_Time shift (ms):</source>
-        <translation type="obsolete">_Χρονική Μετατόπιση (ms):</translation>
+        <translation type="obsolete">_Χρονική Μετατόπιση (χιλ.τουδευτ.):</translation>
     </message>
     <message>
         <source>Time shift value (ms)</source>
-        <translation type="obsolete">Μέγεθος χρονικής μετατόπισης (ms)</translation>
+        <translation type="obsolete">Μέγεθος χρονικής μετατόπισης (χιλ.τουδευτ.)</translation>
     </message>
     <message>
         <source>R_esampling (Hz):</source>
@@ -361,7 +361,7 @@
     </message>
     <message>
         <source>Average bitrate:</source>
-        <translation type="obsolete">Μέσος όρος ρυθμού bit:</translation>
+        <translation type="obsolete">Μέσος ρυθμός μπιτιών:</translation>
     </message>
     <message>
         <source>Number of I frames:</source>
@@ -369,7 +369,7 @@
     </message>
     <message>
         <source>Number of P frames:</source>
-        <translation type="obsolete">Αριθμός πλαισίων:</translation>
+        <translation type="obsolete">Το πλήθος των Π΄ καρέ:</translation>
     </message>
     <message>
         <source>Number of B frames:</source>
@@ -477,7 +477,7 @@
     </message>
     <message>
         <source>CBR</source>
-        <translation type="obsolete">CBR</translation>
+        <translation type="obsolete">Σταθ.Ρυθ.Μπιτ.</translation>
     </message>
     <message>
         <source>ABR</source>
@@ -489,7 +489,7 @@
     </message>
     <message>
         <source>Bit_rate mode:</source>
-        <translation type="obsolete">Κατάσταση Λειτουργίας _Ρυθμού Bit:</translation>
+        <translation type="obsolete">Λειτουργία _ρυθμού Μπιτιών:</translation>
     </message>
     <message>
         <source>_Quality:</source>
@@ -585,11 +585,11 @@
     </message>
     <message>
         <source>4 fields check</source>
-        <translation type="obsolete">Έλεγχος Αγκυλών</translation>
+        <translation type="obsolete">Έλεγχος 4 πεδίων</translation>
     </message>
     <message>
         <source>5 fields check</source>
-        <translation type="obsolete">Έλεγχος Αγκυλών</translation>
+        <translation type="obsolete">Έλεγχος 5 πεδίων</translation>
     </message>
     <message>
         <source>No link</source>
@@ -597,7 +597,7 @@
     </message>
     <message>
         <source>Full link</source>
-        <translation type="obsolete">Προτεινόμενος σύνδεσμος 1</translation>
+        <translation type="obsolete">Πλήρης δεσμός</translation>
     </message>
     <message>
         <source>Y to UV</source>
@@ -673,7 +673,7 @@
     </message>
     <message>
         <source>TDeint</source>
-        <translation type="obsolete">TDeint</translation>
+        <translation type="obsolete">TΑποπλέξιμο</translation>
     </message>
     <message>
         <source>Motion adaptative deinterlacer by Tritical.</source>
@@ -793,7 +793,7 @@
     </message>
     <message>
         <source>Cannot copy.</source>
-        <translation type="obsolete">Αδύνατη η αντιγραφή.</translation>
+        <translation type="obsolete">Αδυναμία αντιγραφής.</translation>
     </message>
     <message>
         <source>Something bad happened (II))</source>
@@ -904,7 +904,7 @@
     </message>
     <message>
         <source>Cannot decode frame</source>
-        <translation type="obsolete">Αδύνατη η αποκωδικοποίηση του καρέ</translation>
+        <translation type="obsolete">Αδύνατη η αποκωδικοποίηση του στιγμιότυπου</translation>
     </message>
     <message>
         <source>Aborting.</source>
@@ -972,7 +972,7 @@
     </message>
     <message>
         <source>Checking video</source>
-        <translation type="obsolete">Έλεγχος βίντεο</translation>
+        <translation type="obsolete">Ελέγχεται το βίντεο</translation>
     </message>
     <message>
         <source>No error found</source>
@@ -992,7 +992,7 @@
     </message>
     <message>
         <source>Cannot delete the selection.</source>
-        <translation type="obsolete">Αδύνατη η διαγραφή της επιλογής.</translation>
+        <translation type="obsolete">Αδυναμία διαγραφής της επιλογής.</translation>
     </message>
     <message>
         <source>You can&apos;t remove all frames</source>
@@ -1110,6 +1110,7 @@
         <source>Failed to connect to avsproxy.
 Is it running ?</source>
         <translation type="obsolete">Αποτυχία σύνδεσης με το avsproxy.
+
 Είναι σε κατάσταση λειτουργίας;</translation>
     </message>
     <message>
@@ -1154,7 +1155,7 @@
     </message>
     <message>
         <source>libavcodec deinterlacer</source>
-        <translation type="obsolete">Ρύθμιση Deinterlacer...</translation>
+        <translation type="obsolete">παράλληλος αποπλέκτης libavcodec</translation>
     </message>
     <message>
         <source>All FFmpeg deinterlace filters (bicubic, median, ...).</source>
@@ -1190,7 +1191,7 @@
     </message>
     <message>
         <source>Resample fps</source>
-        <translation type="obsolete">Επαναδειγματοληψία fps</translation>
+        <translation type="obsolete">Επαναδειγματοληψία </translation>
     </message>
     <message>
         <source>Change framerate while keeping duration.</source>
@@ -1234,7 +1235,7 @@
     </message>
     <message>
         <source>mcDeinterlace</source>
-        <translation type="obsolete">Πεπλεγμένη</translation>
+        <translation type="obsolete">mcΠαράλληλοΑποπλέξιμο</translation>
     </message>
     <message>
         <source>Motion compensation deinterlacer. Ported from MPlayer.</source>
@@ -1270,7 +1271,7 @@
     </message>
     <message>
         <source>Muxing _type:</source>
-        <translation type="obsolete">Τύπος λογαριασμού:</translation>
+        <translation type="obsolete">_Τύπος πολυπλεξίματος:</translation>
     </message>
     <message>
         <source>_Split every MB:</source>
@@ -1282,7 +1283,7 @@
     </message>
     <message>
         <source>AVI Muxer Options</source>
-        <translation type="obsolete">Επιλογές AVI Muxer</translation>
+        <translation type="obsolete">Επιλογές AVI Πολυμείκτη</translation>
     </message>
     <message>
         <source>PCM</source>
@@ -1722,7 +1723,7 @@
     </message>
     <message>
         <source>Finding black frames</source>
-        <translation type="obsolete">Αναζήτηση μαύρων καρέ</translation>
+        <translation type="obsolete">Αναζήτηση μαύρων στιγμιότυπων</translation>

avidemux_2.6.18.tar.gz/avidemux/qt4/i18n/avidemux_en.ts -> avidemux_2.6.19.tar.gz/avidemux/qt4/i18n/avidemux_en.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+186"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+193"/>
         <source>Cannot find a demuxer for %s</source>
         <translation type="unfinished"></translation>
     </message>
@@ -432,17 +432,17 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="+148"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="+151"/>
         <source>&amp;Auto</source>
         <translation type="unfinished">A&amp;uto</translation>
     </message>
     <message>
-        <location line="-133"/>
+        <location line="-136"/>
         <source>Avidemux</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+102"/>
+        <location line="+105"/>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
@@ -497,13 +497,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+44"/>
         <source>Codec O&amp;ptions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+33"/>
-        <source>&lt;b&gt;Video Decoder&lt;b&gt;</source>
+        <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -564,12 +564,12 @@
     </message>
     <message>
         <location line="+114"/>
-        <location line="+978"/>
+        <location line="+932"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-903"/>
+        <location line="-857"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -586,24 +586,18 @@
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
-        <location line="+23"/>
         <location line="+26"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+26"/>
-        <location line="+352"/>
+        <location line="+345"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-637"/>
-        <source>Stop [SPACE]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+23"/>
+        <location line="-607"/>
         <source>Go to previous frame [LEFT]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -673,7 +667,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+18"/>
         <source>00:00:00.000</source>
         <translation type="unfinished"></translation>
     </message>
@@ -693,7 +687,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+38"/>
         <source>Se&amp;lection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -739,7 +733,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+84"/>
         <source>Audio &amp;Metre</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1090,6 +1084,11 @@
         <translation>Set Marker &amp;B</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Reset Markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+4"/>
         <source>Save current settings as default</source>
         <translation>Save current settings as de&amp;fault</translation>
@@ -1209,7 +1208,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+353"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+366"/>
         <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1412,7 +1411,7 @@
         <location filename="../../common/gui_save.cpp" line="-163"/>
         <location line="+21"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+383"/>
+        <location filename="../../common/gui_savenew.cpp" line="+403"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1509,7 +1508,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-165"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-171"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1540,22 +1539,27 @@
     </message>
     <message>
         <location line="+3"/>
-        <source>_Use systray while encoding</source>
+        <source>_Accept non-standard audio frequency for DVD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>_Accept non-standard audio frequency for DVD</source>
+        <source>Create _OpenDML files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Create _OpenDML files</source>
+        <source>_Revert to saved default output settings on video load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>_Revert to saved default output settings on video load</source>
+        <source>_Enable alternative keyboard shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Re_verse UP and DOWN arrow keys for navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1681,6 +1685,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>_Default to the directory of the last read file for saving</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+5"/>
         <source>XVideo (best)</source>
         <translation type="unfinished"></translation>
@@ -1691,6 +1700,11 @@
         <translation type="unfinished"></translation>

avidemux_2.6.18.tar.gz/avidemux/qt4/i18n/avidemux_es.ts -> avidemux_2.6.19.tar.gz/avidemux/qt4/i18n/avidemux_es.ts Changed

@@ -3435,7 +3435,7 @@
         <translation type="obsolete">Puede estar relacionado a un archivo de índice antiguo.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+222"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+229"/>
         <source>Attempt to open %s failed!</source>
         <translation type="unfinished">¡Intento de apertura de %s fallido!</translation>
     </message>
@@ -4674,7 +4674,7 @@
         <translation type="obsolete">&lt;b&gt;Vídeo&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+462"/>
+        <location line="+468"/>
         <location line="+169"/>
         <source>Copy</source>
         <translation type="unfinished">Copiar</translation>
@@ -4688,7 +4688,12 @@
         <translation type="unfinished">Configurar</translation>
     </message>
     <message>
-        <location line="-334"/>
+        <location line="-592"/>
+        <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+258"/>
         <location line="+169"/>
         <source>Filters</source>
         <translation type="unfinished">Filtros</translation>
@@ -4710,7 +4715,7 @@
         <translation type="obsolete">/ 0</translation>
     </message>
     <message>
-        <location line="+671"/>
+        <location line="+647"/>
         <source>00:00:00.000</source>
         <translation type="unfinished">00:00:00.000</translation>
     </message>
@@ -4720,7 +4725,7 @@
         <translation type="unfinished">/ 00:00:00.000</translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="+170"/>
         <location line="+10"/>
         <source>000000</source>
         <translation type="unfinished">000000</translation>
@@ -4752,7 +4757,7 @@
         <translation type="obsolete">Soporte incorporado para</translation>
     </message>
     <message>
-        <location line="-137"/>
+        <location line="-131"/>
         <source>Frame type:</source>
         <translation type="unfinished">Tipo de imagen:</translation>
     </message>
@@ -4761,7 +4766,7 @@
         <translation type="obsolete">DVD</translation>
     </message>
     <message>
-        <location line="-1284"/>
+        <location line="-1263"/>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4821,17 +4826,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+44"/>
         <source>Codec O&amp;ptions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;b&gt;Video Decoder&lt;b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+108"/>
         <location line="+7"/>
         <source>XXXX</source>
         <translation type="unfinished"></translation>
@@ -4868,12 +4868,12 @@
     </message>
     <message>
         <location line="+114"/>
-        <location line="+978"/>
+        <location line="+932"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-903"/>
+        <location line="-857"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4890,24 +4890,18 @@
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
-        <location line="+23"/>
         <location line="+26"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+26"/>
-        <location line="+352"/>
+        <location line="+345"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-637"/>
-        <source>Stop [SPACE]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+23"/>
+        <location line="-607"/>
         <source>Go to previous frame [LEFT]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4977,12 +4971,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+83"/>
+        <location line="+82"/>
         <source>?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+38"/>
         <source>Se&amp;lection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5012,7 +5006,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+84"/>
         <source>Audio &amp;Metre</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5755,17 +5749,16 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+210"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+217"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>_Use systray while encoding</source>
-        <translation type="unfinished">Minimizar en el tray al codificar</translation>
+        <translation type="obsolete">Minimizar en el tray al codificar</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+10"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation type="unfinished">Permitir frecuencia de sonido no estándar para DVD</translation>
     </message>
@@ -5780,6 +5773,16 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>_Enable alternative keyboard shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Re_verse UP and DOWN arrow keys for navigation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+4"/>
         <source>SIMD</source>
         <translation type="unfinished">SIMD</translation>
@@ -5892,12 +5895,22 @@
         <translation type="unfinished">Usar un tag alternativo para MP3 en .mp4</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>_Default to the directory of the last read file for saving</source>
+        <translation type="unfinished"></translation>
+    </message>

avidemux_2.6.18.tar.gz/avidemux/qt4/i18n/avidemux_eu.ts -> avidemux_2.6.19.tar.gz/avidemux/qt4/i18n/avidemux_eu.ts Changed

@@ -984,7 +984,7 @@
         <translation type="obsolete">Badaiteke aurkibide agiri zahar batekin elkartua izatea.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+186"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+193"/>
         <source>Cannot find a demuxer for %s</source>
         <translation>Ezin da desmultiplexatzailea aurkitu %s-rako</translation>
     </message>
@@ -2717,7 +2717,7 @@
         <translation type="obsolete">&lt;b&gt;Bideoa&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+462"/>
+        <location line="+468"/>
         <location line="+169"/>
         <source>Copy</source>
         <translation>Kopiatu</translation>
@@ -2731,7 +2731,7 @@
         <translation>Itxuratu</translation>
     </message>
     <message>
-        <location line="-666"/>
+        <location line="-669"/>
         <source>&amp;Recent</source>
         <translation>Az&amp;kenak</translation>
     </message>
@@ -2740,12 +2740,11 @@
         <translation type="vanished">Kodek Aukerak</translation>
     </message>
     <message>
-        <location line="+74"/>
         <source>&lt;b&gt;Video Decoder&lt;b&gt;</source>
-        <translation>&lt;b&gt;Bideo Dekodeatzailea&lt;b&gt;</translation>
+        <translation type="vanished">&lt;b&gt;Bideo Dekodeatzailea&lt;b&gt;</translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+152"/>
         <location line="+7"/>
         <source>XXXX</source>
         <translation>XXXX</translation>
@@ -2787,14 +2786,13 @@
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
-        <location line="+23"/>
         <location line="+26"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+26"/>
-        <location line="+352"/>
+        <location line="+345"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -2811,12 +2809,12 @@
         <translation type="obsolete">/ 0</translation>
     </message>
     <message>
-        <location line="-297"/>
+        <location line="-290"/>
         <source>Time:</source>
         <translation>Denbora:</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+18"/>
         <source>00:00:00.000</source>
         <translation>00:00:00.000</translation>
     </message>
@@ -2839,7 +2837,7 @@
         <translation type="vanished">Hautapena</translation>
     </message>
     <message>
-        <location line="+117"/>
+        <location line="+111"/>
         <source>A:</source>
         <translation>A:</translation>
     </message>
@@ -2855,7 +2853,7 @@
         <translation>B:</translation>
     </message>
     <message>
-        <location line="-1416"/>
+        <location line="-1389"/>
         <source>Vi&amp;deo</source>
         <translation>&amp;Bideoa</translation>
     </message>
@@ -2930,7 +2928,7 @@
         <translation>&amp;Tresnak</translation>
     </message>
     <message>
-        <location line="+404"/>
+        <location line="+407"/>
         <source>&lt;b&gt;Audio Output&lt;/b&gt;</source>
         <translation>&lt;b&gt;Audio Irteera&lt;/b&gt;</translation>
     </message>
@@ -2949,7 +2947,7 @@
         <translation type="vanished">Nabigazioa</translation>
     </message>
     <message>
-        <location line="+628"/>
+        <location line="+604"/>
         <source>Frame type:</source>
         <translation>Frame mota:</translation>
     </message>
@@ -2966,7 +2964,7 @@
         <translation type="vanished">Audio Neurgailua</translation>
     </message>
     <message>
-        <location line="+340"/>
+        <location line="+318"/>
         <source>&amp;Open...</source>
         <translation>&amp;Ireki...</translation>
     </message>
@@ -3473,8 +3471,8 @@
         <translation>Ctrl+Alt+C</translation>
     </message>
     <message>
-        <location line="-967"/>
-        <location line="+978"/>
+        <location line="-921"/>
+        <location line="+932"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Nabigazioa</translation>
     </message>
@@ -3600,12 +3598,17 @@
         <translation type="obsolete">Bideo CD-a</translation>
     </message>
     <message>
-        <location line="-1703"/>
+        <location line="-1657"/>
         <source>Codec O&amp;ptions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+743"/>
+        <location line="+33"/>
+        <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+710"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3616,11 +3619,6 @@
     </message>
     <message>
         <location line="+26"/>
-        <source>Stop [SPACE]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+23"/>
         <source>Go to previous frame [LEFT]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3685,7 +3683,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+185"/>
+        <location line="+178"/>
         <source>Se&amp;lection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3715,7 +3713,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+84"/>
         <source>Audio &amp;Metre</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4962,7 +4960,7 @@
     </message>
     <message>
         <location line="+1"/>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+353"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+366"/>
         <source>Stereo</source>
         <translation>Estereoa</translation>
     </message>
@@ -5160,7 +5158,7 @@
         <location filename="../../common/gui_save.cpp" line="+281"/>
         <location line="+21"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+383"/>
+        <location filename="../../common/gui_savenew.cpp" line="+403"/>
         <source>Audio</source>
         <translation>Audioa</translation>
     </message>
@@ -5261,7 +5259,7 @@
         <translation type="vanished">Dekodeatu bideoa VDPAU erabiliz</translation>
     </message>

avidemux_2.6.18.tar.gz/avidemux/qt4/i18n/avidemux_fr.ts -> avidemux_2.6.19.tar.gz/avidemux/qt4/i18n/avidemux_fr.ts Changed

@@ -155,7 +155,7 @@
 Ignorer les informations de timing ?</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+186"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+193"/>
         <source>Cannot find a demuxer for %s</source>
         <translation>Impossible de trouver un demuxer pour lire %s</translation>
     </message>
@@ -820,7 +820,7 @@
         <translation>Avidemux</translation>
     </message>
     <message>
-        <location line="+102"/>
+        <location line="+105"/>
         <source>&amp;Help</source>
         <translation>&amp;Aide</translation>
     </message>
@@ -849,12 +849,7 @@
         <translation type="obsolete">Options</translation>
     </message>
     <message>
-        <location line="+79"/>
-        <source>&lt;b&gt;Video Decoder&lt;b&gt;</source>
-        <translation>&lt;b&gt;Décodeur Vidéo&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <location line="+100"/>
+        <location line="+182"/>
         <location line="+142"/>
         <location line="+169"/>
         <location line="+181"/>
@@ -899,7 +894,7 @@
         <translation>&lt;b&gt;Format de sortie&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+968"/>
+        <location line="+922"/>
         <source>&amp;Open...</source>
         <translation>&amp;Ouvrir...</translation>
     </message>
@@ -972,7 +967,7 @@
         <translation>Cot&amp;e à cote</translation>
     </message>
     <message>
-        <location line="-1824"/>
+        <location line="-1781"/>
         <source>Vi&amp;deo</source>
         <translation></translation>
     </message>
@@ -1007,12 +1002,17 @@
         <translation>&amp;Récent</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+44"/>
         <source>Codec O&amp;ptions</source>
         <translation></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+33"/>
+        <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Décodeur Vidéo&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location line="+75"/>
         <location line="+7"/>
         <source>XXXX</source>
         <translation></translation>
@@ -1024,12 +1024,12 @@
     </message>
     <message>
         <location line="+149"/>
-        <location line="+978"/>
+        <location line="+932"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-903"/>
+        <location line="-857"/>
         <source>Play [SPACE]</source>
         <translation>Lire [SPACE]</translation>
     </message>
@@ -1046,24 +1046,18 @@
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
-        <location line="+23"/>
         <location line="+26"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+26"/>
-        <location line="+352"/>
+        <location line="+345"/>
         <source>...</source>
         <translation></translation>
     </message>
     <message>
-        <location line="-637"/>
-        <source>Stop [SPACE]</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location line="+23"/>
+        <location line="-607"/>
         <source>Go to previous frame [LEFT]</source>
         <translation type="unfinished">Image précédente [GAUCHE]</translation>
     </message>
@@ -1115,7 +1109,7 @@
     <message>
         <location line="+23"/>
         <source>Backward one minute [CTRL+DOWN]</source>
-        <translation>Reculer d&quot;une minute [CTRL+BAS]</translation>
+        <translation>Reculer d&apos;une minute [CTRL+BAS]</translation>
     </message>
     <message>
         <location line="+23"/>
@@ -1133,7 +1127,7 @@
         <translation>Temps:</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+18"/>
         <source>00:00:00.000</source>
         <translation></translation>
     </message>
@@ -1153,7 +1147,7 @@
         <translation></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+38"/>
         <source>Se&amp;lection</source>
         <translation></translation>
     </message>
@@ -1199,7 +1193,7 @@
         <translation></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+84"/>
         <source>Audio &amp;Metre</source>
         <translation></translation>
     </message>
@@ -1431,7 +1425,7 @@
         <translation type="obsolete">Utiliser VDPAU pour décoder</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+210"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+217"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation>Utiliser DXVA2 pour décoder (Windows)</translation>
     </message>
@@ -1441,12 +1435,11 @@
         <translation>Activer OpenGL</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>_Use systray while encoding</source>
-        <translation>Réduire dans la barre de taches</translation>
+        <translation type="vanished">Réduire dans la barre de taches</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+6"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation>Accepter les fréquences non standard pour les DVDs</translation>
     </message>
@@ -1458,7 +1451,17 @@
     <message>
         <location line="+1"/>
         <source>_Revert to saved default output settings on video load</source>
-        <translation>&amp;Revenir aux paramètres par défaut enregistrés lors du chargement vidéo</translation>
+        <translation>_Revenir aux paramètres par défaut enregistrés lors du chargement vidéo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>_Enable alternative keyboard shortcuts</source>
+        <translation>Activer les raccourcis claviers alternatifs</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Re_verse UP and DOWN arrow keys for navigation</source>
+        <translation>Inverser les touches HAUT et BAS pour la navigation</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -1568,6 +1571,11 @@
         <translation>Utiliser un tag alternatif pour les pistes mp3 (.mp4)</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>_Default to the directory of the last read file for saving</source>
+        <translation>Utiliser le répertoire du dernier fichier lu comme répertoire de sauvegarde par défaut</translation>
+    </message>
+    <message>

avidemux_2.6.18.tar.gz/avidemux/qt4/i18n/avidemux_hu.ts -> avidemux_2.6.19.tar.gz/avidemux/qt4/i18n/avidemux_hu.ts Changed

@@ -4,7 +4,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+222"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+229"/>
         <source>Attempt to open %s failed!</source>
         <translation>A %s megnyitása sikertelen!</translation>
     </message>
@@ -607,7 +607,7 @@
         <translation>Avidemux</translation>
     </message>
     <message>
-        <location line="+462"/>
+        <location line="+468"/>
         <location line="+169"/>
         <source>Copy</source>
         <translation>Másolás</translation>
@@ -639,24 +639,23 @@
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
-        <location line="+23"/>
         <location line="+26"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+26"/>
-        <location line="+352"/>
+        <location line="+345"/>
         <source>...</source>
         <translation>…</translation>
     </message>
     <message>
-        <location line="-297"/>
+        <location line="-290"/>
         <source>Time:</source>
         <translation>Idő:</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+18"/>
         <source>00:00:00.000</source>
         <translation>00:00:00.000</translation>
     </message>
@@ -675,13 +674,13 @@
         <translation type="vanished">Kijelölés</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+128"/>
         <location line="+10"/>
         <source>000000</source>
         <translation>000000</translation>
     </message>
     <message>
-        <location line="-1441"/>
+        <location line="-1414"/>
         <source>&amp;Help</source>
         <translation>&amp;Súgó</translation>
     </message>
@@ -726,7 +725,7 @@
         <translation>U&amp;grás</translation>
     </message>
     <message>
-        <location line="+1583"/>
+        <location line="+1540"/>
         <source>&amp;Open...</source>
         <translation>M&amp;egnyitás…</translation>
     </message>
@@ -789,12 +788,12 @@
         <translation>F7</translation>
     </message>
     <message>
-        <location line="-1075"/>
+        <location line="-1029"/>
         <source>ms</source>
         <translation>ms</translation>
     </message>
     <message>
-        <location line="+793"/>
+        <location line="+763"/>
         <source>A:</source>
         <translation>A:</translation>
     </message>
@@ -804,7 +803,7 @@
         <translation>B:</translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+274"/>
         <source>&amp;Input</source>
         <translation>&amp;Bemenet</translation>
     </message>
@@ -824,17 +823,17 @@
         <translation>Fen&amp;t</translation>
     </message>
     <message>
-        <location line="-533"/>
+        <location line="-511"/>
         <source>Frame type:</source>
         <translation>Képkocka típus:</translation>
     </message>
     <message>
-        <location line="+521"/>
+        <location line="+499"/>
         <source>&amp;Separate</source>
         <translation>&amp;Szeparált</translation>
     </message>
     <message>
-        <location line="-1786"/>
+        <location line="-1743"/>
         <source>&amp;Toolbars</source>
         <translation>Eszköz&amp;tárak</translation>
     </message>
@@ -853,12 +852,11 @@
         <translation type="vanished">Kódoló beállítás</translation>
     </message>
     <message>
-        <location line="+74"/>
         <source>&lt;b&gt;Video Decoder&lt;b&gt;</source>
-        <translation>&lt;b&gt;Videó dekódoló&lt;b&gt;</translation>
+        <translation type="vanished">&lt;b&gt;Videó dekódoló&lt;b&gt;</translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+152"/>
         <location line="+7"/>
         <source>XXXX</source>
         <translation>XXXX</translation>
@@ -900,7 +898,7 @@
         <translation type="vanished">Hang méter</translation>
     </message>
     <message>
-        <location line="+1078"/>
+        <location line="+1032"/>
         <source>&amp;Codec Options</source>
         <translation>&amp;Kódek beállítás</translation>
     </message>
@@ -910,8 +908,8 @@
         <translation>Alt+Ctrl+C</translation>
     </message>
     <message>
-        <location line="-967"/>
-        <location line="+978"/>
+        <location line="-921"/>
+        <location line="+932"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Navigálás</translation>
     </message>
@@ -946,12 +944,17 @@
         <translation>Ctrl+Alt+M</translation>
     </message>
     <message>
-        <location line="-1691"/>
+        <location line="-1645"/>
         <source>Codec O&amp;ptions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+743"/>
+        <location line="+33"/>
+        <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+710"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -962,11 +965,6 @@
     </message>
     <message>
         <location line="+26"/>
-        <source>Stop [SPACE]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+23"/>
         <source>Go to previous frame [LEFT]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1031,7 +1029,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+185"/>
+        <location line="+178"/>
         <source>Se&amp;lection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1061,7 +1059,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+84"/>
         <source>Audio &amp;Metre</source>
         <translation type="unfinished"></translation>

avidemux_2.6.18.tar.gz/avidemux/qt4/i18n/avidemux_it.ts -> avidemux_2.6.19.tar.gz/avidemux/qt4/i18n/avidemux_it.ts Changed

@@ -3768,7 +3768,7 @@
         <translation type="obsolete">Potrebbe essere correlato a un vecchio file di indice.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+222"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+229"/>
         <source>Attempt to open %s failed!</source>
         <translation>Tentativo di aprire %s fallito!</translation>
     </message>
@@ -5552,7 +5552,7 @@
         <translation type="obsolete">&lt;b&gt;Video&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+462"/>
+        <location line="+468"/>
         <location line="+169"/>
         <source>Copy</source>
         <translation>Copia</translation>
@@ -5592,14 +5592,13 @@
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
-        <location line="+23"/>
         <location line="+26"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+26"/>
-        <location line="+352"/>
+        <location line="+345"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -5616,12 +5615,12 @@
         <translation type="obsolete">/ 0</translation>
     </message>
     <message>
-        <location line="-297"/>
+        <location line="-290"/>
         <source>Time:</source>
         <translation>Tempo:</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+18"/>
         <source>00:00:00.000</source>
         <translation>00:00:00.000</translation>
     </message>
@@ -5644,13 +5643,13 @@
         <translation type="vanished">Selezione</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+128"/>
         <location line="+10"/>
         <source>000000</source>
         <translation>000000</translation>
     </message>
     <message>
-        <location line="-1441"/>
+        <location line="-1414"/>
         <source>&amp;Help</source>
         <translation>A&amp;iuto</translation>
     </message>
@@ -5711,7 +5710,7 @@
         <translation type="obsolete">A&amp;uto</translation>
     </message>
     <message>
-        <location line="+1583"/>
+        <location line="+1540"/>
         <source>&amp;Open...</source>
         <translation>&amp;Apri...</translation>
     </message>
@@ -6238,12 +6237,12 @@
         <translation>Affiancati ver&amp;ticalmente</translation>
     </message>
     <message>
-        <location line="-533"/>
+        <location line="-511"/>
         <source>Frame type:</source>
         <translation>Tipo di fotogramma:</translation>
     </message>
     <message>
-        <location line="+521"/>
+        <location line="+499"/>
         <source>&amp;Separate</source>
         <translation>&amp;Separati</translation>
     </message>
@@ -6256,7 +6255,7 @@
         <translation type="obsolete">Ctrl+W</translation>
     </message>
     <message>
-        <location line="-1184"/>
+        <location line="-1138"/>
         <source>ms</source>
         <translation>ms</translation>
     </message>
@@ -6265,7 +6264,7 @@
         <translation type="obsolete">Salva selezione in immagini JPEG...</translation>
     </message>
     <message>
-        <location line="+793"/>
+        <location line="+763"/>
         <source>A:</source>
         <translation>A:</translation>
     </message>
@@ -6303,7 +6302,7 @@
         <translation type="obsolete">Video CD</translation>
     </message>
     <message>
-        <location line="-1402"/>
+        <location line="-1375"/>
         <source>&amp;Toolbars</source>
         <translation>&amp;Barre degli strumenti</translation>
     </message>
@@ -6322,12 +6321,11 @@
         <translation type="vanished">Opzioni codec</translation>
     </message>
     <message>
-        <location line="+74"/>
         <source>&lt;b&gt;Video Decoder&lt;b&gt;</source>
-        <translation>&lt;b&gt;Decoder video&lt;b&gt;</translation>
+        <translation type="vanished">&lt;b&gt;Decoder video&lt;b&gt;</translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+152"/>
         <location line="+7"/>
         <source>XXXX</source>
         <translation>XXXX</translation>
@@ -6369,7 +6367,7 @@
         <translation type="vanished">Audiometro</translation>
     </message>
     <message>
-        <location line="+1078"/>
+        <location line="+1032"/>
         <source>&amp;Codec Options</source>
         <translation>Opzioni &amp;codec</translation>
     </message>
@@ -6379,8 +6377,8 @@
         <translation>Ctrl+Alt+C</translation>
     </message>
     <message>
-        <location line="-967"/>
-        <location line="+978"/>
+        <location line="-921"/>
+        <location line="+932"/>
         <source>&amp;Navigation</source>
         <translation>&amp;Navigazione</translation>
     </message>
@@ -6415,12 +6413,17 @@
         <translation>Ctrl+Alt+M</translation>
     </message>
     <message>
-        <location line="-1691"/>
+        <location line="-1645"/>
         <source>Codec O&amp;ptions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+743"/>
+        <location line="+33"/>
+        <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+710"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6431,11 +6434,6 @@
     </message>
     <message>
         <location line="+26"/>
-        <source>Stop [SPACE]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+23"/>
         <source>Go to previous frame [LEFT]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6500,7 +6498,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+185"/>
+        <location line="+178"/>
         <source>Se&amp;lection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6530,7 +6528,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+84"/>
         <source>Audio &amp;Metre</source>
         <translation type="unfinished"></translation>

avidemux_2.6.18.tar.gz/avidemux/qt4/i18n/avidemux_ja.ts -> avidemux_2.6.19.tar.gz/avidemux/qt4/i18n/avidemux_ja.ts Changed

@@ -2395,7 +2395,7 @@
         <translation type="obsolete">古いインデックスファイルに関係するかもしれません.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+222"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+229"/>
         <source>Attempt to open %s failed!</source>
         <translation type="unfinished">%s を開く試みは失敗しました!</translation>
     </message>
@@ -3424,7 +3424,7 @@
         <translation type="obsolete">&lt;b&gt;映像&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+462"/>
+        <location line="+468"/>
         <location line="+169"/>
         <source>Copy</source>
         <translation type="unfinished">コピー</translation>
@@ -3438,7 +3438,12 @@
         <translation type="unfinished">構成</translation>
     </message>
     <message>
-        <location line="-334"/>
+        <location line="-592"/>
+        <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+258"/>
         <location line="+169"/>
         <source>Filters</source>
         <translation type="unfinished">フィルタ</translation>
@@ -3460,7 +3465,7 @@
         <translation type="obsolete">/ 0</translation>
     </message>
     <message>
-        <location line="+671"/>
+        <location line="+647"/>
         <source>00:00:00.000</source>
         <translation type="unfinished">00:00:00.000</translation>
     </message>
@@ -3470,7 +3475,7 @@
         <translation type="unfinished">/ 00:00:00.000</translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="+170"/>
         <location line="+10"/>
         <source>000000</source>
         <translation type="unfinished">000000</translation>
@@ -3502,12 +3507,12 @@
         <translation type="obsolete">内蔵サポート</translation>
     </message>
     <message>
-        <location line="-137"/>
+        <location line="-131"/>
         <source>Frame type:</source>
         <translation type="unfinished">フレームタイプ:</translation>
     </message>
     <message>
-        <location line="-1284"/>
+        <location line="-1263"/>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3567,17 +3572,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+44"/>
         <source>Codec O&amp;ptions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;b&gt;Video Decoder&lt;b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+108"/>
         <location line="+7"/>
         <source>XXXX</source>
         <translation type="unfinished"></translation>
@@ -3614,12 +3614,12 @@
     </message>
     <message>
         <location line="+114"/>
-        <location line="+978"/>
+        <location line="+932"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-903"/>
+        <location line="-857"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3636,24 +3636,18 @@
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
-        <location line="+23"/>
         <location line="+26"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+26"/>
-        <location line="+352"/>
+        <location line="+345"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-637"/>
-        <source>Stop [SPACE]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+23"/>
+        <location line="-607"/>
         <source>Go to previous frame [LEFT]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3723,12 +3717,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+83"/>
+        <location line="+82"/>
         <source>?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+38"/>
         <source>Se&amp;lection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3758,7 +3752,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+84"/>
         <source>Audio &amp;Metre</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4452,17 +4446,16 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+210"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+217"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>_Use systray while encoding</source>
-        <translation type="unfinished">エンコード中シストレーを使う(_U)</translation>
+        <translation type="obsolete">エンコード中シストレーを使う(_U)</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+10"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation type="unfinished">DVDに標準でない音声周波数を受け付ける(_A)</translation>
     </message>
@@ -4477,6 +4470,16 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>_Enable alternative keyboard shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Re_verse UP and DOWN arrow keys for navigation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+4"/>
         <source>SIMD</source>
         <translation type="unfinished">
@@ -4602,13 +4605,23 @@
         <translation type="unfinished">.mp4にmp3の代替タグを使う(_U)</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>_Default to the directory of the last read file for saving</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+5"/>
         <source>XVideo (best)</source>

avidemux_2.6.18.tar.gz/avidemux/qt4/i18n/avidemux_pl.ts -> avidemux_2.6.19.tar.gz/avidemux/qt4/i18n/avidemux_pl.ts Changed

@@ -3614,7 +3614,7 @@
         <translation type="obsolete">Może być związany ze starym plikiem indeksu.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+222"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+229"/>
         <source>Attempt to open %s failed!</source>
         <translation type="unfinished">Nie udało się otworzyć %s!</translation>
     </message>
@@ -4874,7 +4874,7 @@
         <translation type="obsolete">&lt;b&gt;Obraz&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+462"/>
+        <location line="+468"/>
         <location line="+169"/>
         <source>Copy</source>
         <translation type="unfinished">Kopiuj</translation>
@@ -4888,7 +4888,12 @@
         <translation type="unfinished">Konfiguruj</translation>
     </message>
     <message>
-        <location line="-334"/>
+        <location line="-592"/>
+        <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+258"/>
         <location line="+169"/>
         <source>Filters</source>
         <translation type="unfinished">Filtry</translation>
@@ -4911,12 +4916,12 @@
         <translation type="obsolete">0</translation>
     </message>
     <message>
-        <location line="+612"/>
+        <location line="+588"/>
         <source>00:00:00.000</source>
         <translation type="unfinished">00:00:00.000</translation>
     </message>
     <message>
-        <location line="+181"/>
+        <location line="+175"/>
         <source>A:</source>
         <translation type="unfinished">A:</translation>
     </message>
@@ -4952,12 +4957,12 @@
         <translation type="obsolete">DVD</translation>
     </message>
     <message>
-        <location line="-137"/>
+        <location line="-131"/>
         <source>Frame type:</source>
         <translation type="unfinished">Typ klatki:</translation>
     </message>
     <message>
-        <location line="-1284"/>
+        <location line="-1263"/>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5017,17 +5022,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+44"/>
         <source>Codec O&amp;ptions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;b&gt;Video Decoder&lt;b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+108"/>
         <location line="+7"/>
         <source>XXXX</source>
         <translation type="unfinished"></translation>
@@ -5059,12 +5059,12 @@
     </message>
     <message>
         <location line="+114"/>
-        <location line="+978"/>
+        <location line="+932"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-903"/>
+        <location line="-857"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5081,24 +5081,18 @@
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
-        <location line="+23"/>
         <location line="+26"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+26"/>
-        <location line="+352"/>
+        <location line="+345"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-637"/>
-        <source>Stop [SPACE]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+23"/>
+        <location line="-607"/>
         <source>Go to previous frame [LEFT]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5168,7 +5162,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+40"/>
         <source>/ 00:00:00.000</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5178,7 +5172,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+38"/>
         <source>Se&amp;lection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5208,7 +5202,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+84"/>
         <source>Audio &amp;Metre</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5985,17 +5979,16 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+210"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+217"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>_Use systray while encoding</source>
-        <translation type="unfinished">Użyj tacki systemowej podczas kodowania</translation>
+        <translation type="obsolete">Użyj tacki systemowej podczas kodowania</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+10"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation type="unfinished">_Akceptuj niestandardową częstotliwość dźwięku dla DVD</translation>
     </message>
@@ -6010,6 +6003,16 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>_Enable alternative keyboard shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Re_verse UP and DOWN arrow keys for navigation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+4"/>
         <source>SIMD</source>
         <translation type="unfinished">SIMD</translation>
@@ -6122,12 +6125,22 @@
         <translation type="unfinished">_Użyj alternatywnej etykiety dla pliku MP3 w .mp4</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>_Default to the directory of the last read file for saving</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+5"/>
         <source>XVideo (best)</source>

avidemux_2.6.18.tar.gz/avidemux/qt4/i18n/avidemux_pt_BR.ts -> avidemux_2.6.19.tar.gz/avidemux/qt4/i18n/avidemux_pt_BR.ts Changed

@@ -33,7 +33,7 @@
 <context>
     <name>ADM_Composer</name>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+186"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+193"/>
         <source>Cannot find a demuxer for %s</source>
         <translation type="unfinished"></translation>
     </message>
@@ -494,7 +494,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+102"/>
+        <location line="+105"/>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
@@ -554,13 +554,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+44"/>
         <source>Codec O&amp;ptions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+33"/>
-        <source>&lt;b&gt;Video Decoder&lt;b&gt;</source>
+        <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -621,12 +621,12 @@
     </message>
     <message>
         <location line="+114"/>
-        <location line="+978"/>
+        <location line="+932"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-903"/>
+        <location line="-857"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -643,24 +643,18 @@
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
-        <location line="+23"/>
         <location line="+26"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+26"/>
-        <location line="+352"/>
+        <location line="+345"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-637"/>
-        <source>Stop [SPACE]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+23"/>
+        <location line="-607"/>
         <source>Go to previous frame [LEFT]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -730,7 +724,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+18"/>
         <source>00:00:00.000</source>
         <translation type="unfinished"></translation>
     </message>
@@ -750,7 +744,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+38"/>
         <source>Se&amp;lection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -796,7 +790,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+84"/>
         <source>Audio &amp;Metre</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1079,7 +1073,7 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+430"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+443"/>
         <source>Output</source>
         <translation type="unfinished">Saida</translation>
     </message>
@@ -1330,7 +1324,7 @@
         <location filename="../../common/gui_save.cpp" line="+281"/>
         <location line="+21"/>
         <location line="+7"/>
-        <location filename="../../common/gui_savenew.cpp" line="+383"/>
+        <location filename="../../common/gui_savenew.cpp" line="+403"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1427,7 +1421,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-165"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="-171"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1458,22 +1452,27 @@
     </message>
     <message>
         <location line="+3"/>
-        <source>_Use systray while encoding</source>
+        <source>_Accept non-standard audio frequency for DVD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>_Accept non-standard audio frequency for DVD</source>
+        <source>Create _OpenDML files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Create _OpenDML files</source>
+        <source>_Revert to saved default output settings on video load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>_Revert to saved default output settings on video load</source>
+        <source>_Enable alternative keyboard shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Re_verse UP and DOWN arrow keys for navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1599,6 +1598,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>_Default to the directory of the last read file for saving</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+5"/>
         <source>XVideo (best)</source>
         <translation type="unfinished"></translation>
@@ -1609,6 +1613,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
+        <source>DXVA2 (best)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+7"/>
         <source>OpenGL (best)</source>
         <translation type="unfinished"></translation>
@@ -1880,6 +1889,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Reset Markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+2"/>
         <source>Pr&amp;eferences</source>
         <translation type="unfinished"></translation>
@@ -2013,11 +2027,11 @@
     <message>

avidemux_2.6.18.tar.gz/avidemux/qt4/i18n/avidemux_ru.ts -> avidemux_2.6.19.tar.gz/avidemux/qt4/i18n/avidemux_ru.ts Changed

@@ -1056,7 +1056,7 @@
     </message>
     <message>
         <source>_Accept non-standard audio frequency for DVD</source>
-        <translation type="obsolete">Позволять нестрандартную частоту звука для DVD</translation>
+        <translation type="obsolete">Позволять нестандартную частоту звука для DVD</translation>
     </message>
     <message>
         <source>Create _OpenDML files</source>
@@ -1208,7 +1208,7 @@
     </message>
     <message>
         <source>Default Postprocessing</source>
-        <translation type="obsolete">Постпроцессинг по-умолчанию</translation>
+        <translation type="obsolete">Постпроцессинг по умолчанию</translation>
     </message>
     <message>
         <source>Use _Global GlyphSet</source>
@@ -2293,7 +2293,7 @@
         <translation type="obsolete">Файл идентифицирован, но не поддерживается.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+222"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+229"/>
         <source>Attempt to open %s failed!</source>
         <translation type="unfinished">Ошибка при открытии %s!</translation>
     </message>
@@ -3339,7 +3339,7 @@
         <translation type="obsolete">&lt;b&gt;Видео&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="+477"/>
+        <location filename="../ADM_userInterfaces/ADM_gui/gui2.ui" line="+483"/>
         <location line="+169"/>
         <source>Copy</source>
         <translation type="unfinished">Копировать</translation>
@@ -3381,7 +3381,7 @@
             </translation>
     </message>
     <message>
-        <location line="+625"/>
+        <location line="+602"/>
         <source>Time:</source>
         <translation type="unfinished">Время:</translation>
     </message>
@@ -3394,7 +3394,7 @@
         <translation type="obsolete">Выделено</translation>
     </message>
     <message>
-        <location line="-1214"/>
+        <location line="-1194"/>
         <source>&amp;Help</source>
         <translation type="unfinished">Сп&amp;равка</translation>
     </message>
@@ -3455,7 +3455,7 @@
         <translation type="obsolete">&amp;Авто</translation>
     </message>
     <message>
-        <location line="+1583"/>
+        <location line="+1540"/>
         <source>&amp;Open...</source>
         <translation type="unfinished">&amp;Открыть...</translation>
     </message>
@@ -3807,12 +3807,17 @@
         <translation type="unfinished">&amp;Сверху</translation>
     </message>
     <message>
-        <location line="-533"/>
+        <location line="-1636"/>
+        <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Декодер видео&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location line="+1125"/>
         <source>Frame type:</source>
         <translation type="unfinished">Тип кадра:</translation>
     </message>
     <message>
-        <location line="+521"/>
+        <location line="+499"/>
         <source>&amp;Separate</source>
         <translation type="unfinished">&amp;Отделить</translation>
     </message>
@@ -3821,12 +3826,12 @@
         <translation type="obsolete">&amp;Закрыть</translation>
     </message>
     <message>
-        <location line="-1907"/>
+        <location line="-1867"/>
         <source>Avidemux</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+121"/>
+        <location line="+124"/>
         <source>&amp;Toolbars</source>
         <translation type="unfinished">&amp;Панели</translation>
     </message>
@@ -3841,17 +3846,16 @@
         <translation type="unfinished">&amp;Недавно</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+44"/>
         <source>Codec O&amp;ptions</source>
         <translation type="unfinished">На&amp;стройки кодека</translation>
     </message>
     <message>
-        <location line="+33"/>
         <source>&lt;b&gt;Video Decoder&lt;b&gt;</source>
-        <translation type="unfinished">&lt;b&gt;Декодер видео&lt;b&gt;</translation>
+        <translation type="obsolete">&lt;b&gt;Декодер видео&lt;b&gt;</translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+108"/>
         <location line="+7"/>
         <source>XXXX</source>
         <translation type="unfinished"></translation>
@@ -3883,12 +3887,12 @@
     </message>
     <message>
         <location line="+114"/>
-        <location line="+978"/>
+        <location line="+932"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished">&amp;Навигация</translation>
     </message>
     <message>
-        <location line="-903"/>
+        <location line="-857"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished">Воспроизвести [SPACE]</translation>
     </message>
@@ -3905,24 +3909,18 @@
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
-        <location line="+23"/>
         <location line="+26"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+26"/>
-        <location line="+352"/>
+        <location line="+345"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-637"/>
-        <source>Stop [SPACE]</source>
-        <translation type="unfinished">Остановить [SPACE]</translation>
-    </message>
-    <message>
-        <location line="+23"/>
+        <location line="-607"/>
         <source>Go to previous frame [LEFT]</source>
         <translation type="unfinished">Предыдущий кадр [LEFT]</translation>
     </message>
@@ -3944,12 +3942,12 @@
     <message>
         <location line="+23"/>
         <source>Set start marker [CTRL+PAGEUP]</source>
-        <translation type="unfinished">Установить маркер A [CTRL+PAGEUP]</translation>
+        <translation type="unfinished">Поставить маркер A [CTRL+PAGEUP]</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Set end marker [CTRL+PAGEDOWN]</source>
-        <translation type="unfinished">Установить маркер B [CTRL+PAGEDOWN]</translation>
+        <translation type="unfinished">Поставить маркер B [CTRL+PAGEDOWN]</translation>
     </message>
     <message>
         <location line="+26"/>
@@ -3987,7 +3985,7 @@
         <translation type="unfinished">Вперед на 1 минуту</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+76"/>
         <source>00:00:00.000</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4002,9 +4000,9 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+38"/>
         <source>Se&amp;lection</source>
-        <translation type="unfinished">&amp;lВыбор</translation>
+        <translation type="unfinished">&amp;Выбор</translation>
     </message>
     <message>
         <location line="+73"/>
@@ -4048,7 +4046,7 @@
         <translation type="unfinished">&amp;Громкость</translation>
     </message>

avidemux_2.6.18.tar.gz/avidemux/qt4/i18n/avidemux_sr.ts -> avidemux_2.6.19.tar.gz/avidemux/qt4/i18n/avidemux_sr.ts Changed

@@ -2304,7 +2304,7 @@
         <translation type="obsolete">Можда се односи на неку стару датотеку са индексом.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+222"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+229"/>
         <source>Attempt to open %s failed!</source>
         <translation type="unfinished">Покушај да отворим %s није успео!</translation>
     </message>
@@ -3327,7 +3327,7 @@
         <translation type="obsolete">&lt;b&gt;Видео&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+462"/>
+        <location line="+468"/>
         <location line="+169"/>
         <source>Copy</source>
         <translation type="unfinished">Без измене</translation>
@@ -3341,7 +3341,12 @@
         <translation type="unfinished">Поставке</translation>
     </message>
     <message>
-        <location line="-334"/>
+        <location line="-592"/>
+        <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+258"/>
         <location line="+169"/>
         <source>Filters</source>
         <translation type="unfinished">Филтери</translation>
@@ -3363,7 +3368,7 @@
         <translation type="obsolete">/ 0</translation>
     </message>
     <message>
-        <location line="+671"/>
+        <location line="+647"/>
         <source>00:00:00.000</source>
         <translation type="unfinished">00:00:00.000</translation>
     </message>
@@ -3373,7 +3378,7 @@
         <translation type="unfinished">/ 00:00:00.000</translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="+170"/>
         <location line="+10"/>
         <source>000000</source>
         <translation type="unfinished">000000</translation>
@@ -3405,12 +3410,12 @@
         <translation type="obsolete">Подржани су</translation>
     </message>
     <message>
-        <location line="-137"/>
+        <location line="-131"/>
         <source>Frame type:</source>
         <translation type="unfinished">Тип кадра:</translation>
     </message>
     <message>
-        <location line="-1284"/>
+        <location line="-1263"/>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3470,17 +3475,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+44"/>
         <source>Codec O&amp;ptions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;b&gt;Video Decoder&lt;b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+108"/>
         <location line="+7"/>
         <source>XXXX</source>
         <translation type="unfinished"></translation>
@@ -3517,12 +3517,12 @@
     </message>
     <message>
         <location line="+114"/>
-        <location line="+978"/>
+        <location line="+932"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-903"/>
+        <location line="-857"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3539,24 +3539,18 @@
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
-        <location line="+23"/>
         <location line="+26"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+26"/>
-        <location line="+352"/>
+        <location line="+345"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-637"/>
-        <source>Stop [SPACE]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+23"/>
+        <location line="-607"/>
         <source>Go to previous frame [LEFT]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3626,12 +3620,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+83"/>
+        <location line="+82"/>
         <source>?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+38"/>
         <source>Se&amp;lection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3661,7 +3655,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+84"/>
         <source>Audio &amp;Metre</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4347,17 +4341,16 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+210"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+217"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>_Use systray while encoding</source>
-        <translation type="unfinished">Смести у о_бавештајну зону панела приликом кодирања</translation>
+        <translation type="obsolete">Смести у о_бавештајну зону панела приликом кодирања</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+10"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation type="unfinished">_Дозволи нестандардне учестаности звука за ДВД</translation>
     </message>
@@ -4372,6 +4365,16 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>_Enable alternative keyboard shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Re_verse UP and DOWN arrow keys for navigation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+4"/>
         <source>SIMD</source>
         <translation type="unfinished">SIMD</translation>
@@ -4484,12 +4487,22 @@
         <translation type="unfinished">Користи _алтернативни таг за MP3 у .mp4</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>_Default to the directory of the last read file for saving</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+5"/>
         <source>XVideo (best)</source>

avidemux_2.6.18.tar.gz/avidemux/qt4/i18n/avidemux_sr@latin.ts -> avidemux_2.6.19.tar.gz/avidemux/qt4/i18n/avidemux_sr@latin.ts Changed

@@ -2304,7 +2304,7 @@
         <translation type="obsolete">Možda se odnosi na neku staru datoteku sa indeksom.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+222"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+229"/>
         <source>Attempt to open %s failed!</source>
         <translation type="unfinished">Pokušaj da otvorim %s nije uspeo!</translation>
     </message>
@@ -3327,7 +3327,7 @@
         <translation type="obsolete">&lt;b&gt;Video&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+462"/>
+        <location line="+468"/>
         <location line="+169"/>
         <source>Copy</source>
         <translation type="unfinished">Bez izmene</translation>
@@ -3341,7 +3341,12 @@
         <translation type="unfinished">Postavke</translation>
     </message>
     <message>
-        <location line="-334"/>
+        <location line="-592"/>
+        <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+258"/>
         <location line="+169"/>
         <source>Filters</source>
         <translation type="unfinished">Filteri</translation>
@@ -3363,7 +3368,7 @@
         <translation type="obsolete">/ 0</translation>
     </message>
     <message>
-        <location line="+671"/>
+        <location line="+647"/>
         <source>00:00:00.000</source>
         <translation type="unfinished">00:00:00.000</translation>
     </message>
@@ -3373,7 +3378,7 @@
         <translation type="unfinished">/ 00:00:00.000</translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="+170"/>
         <location line="+10"/>
         <source>000000</source>
         <translation type="unfinished">000000</translation>
@@ -3405,12 +3410,12 @@
         <translation type="obsolete">Podržani su</translation>
     </message>
     <message>
-        <location line="-137"/>
+        <location line="-131"/>
         <source>Frame type:</source>
         <translation type="unfinished">Tip kadra:</translation>
     </message>
     <message>
-        <location line="-1284"/>
+        <location line="-1263"/>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3470,17 +3475,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+44"/>
         <source>Codec O&amp;ptions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;b&gt;Video Decoder&lt;b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+108"/>
         <location line="+7"/>
         <source>XXXX</source>
         <translation type="unfinished"></translation>
@@ -3517,12 +3517,12 @@
     </message>
     <message>
         <location line="+114"/>
-        <location line="+978"/>
+        <location line="+932"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-903"/>
+        <location line="-857"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3539,24 +3539,18 @@
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
-        <location line="+23"/>
         <location line="+26"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+26"/>
-        <location line="+352"/>
+        <location line="+345"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-637"/>
-        <source>Stop [SPACE]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+23"/>
+        <location line="-607"/>
         <source>Go to previous frame [LEFT]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3626,12 +3620,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+83"/>
+        <location line="+82"/>
         <source>?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+38"/>
         <source>Se&amp;lection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3661,7 +3655,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+84"/>
         <source>Audio &amp;Metre</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4347,17 +4341,16 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+210"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+217"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>_Use systray while encoding</source>
-        <translation type="unfinished">Smesti u o_baveštajnu zonu panela prilikom kodiranja</translation>
+        <translation type="obsolete">Smesti u o_baveštajnu zonu panela prilikom kodiranja</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+10"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation type="unfinished">_Dozvoli nestandardne učestanosti zvuka za DVD</translation>
     </message>
@@ -4372,6 +4365,16 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>_Enable alternative keyboard shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Re_verse UP and DOWN arrow keys for navigation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+4"/>
         <source>SIMD</source>
         <translation type="unfinished">SIMD</translation>
@@ -4484,12 +4487,22 @@
         <translation type="unfinished">Koristi _alternativni tag za MP3 u .mp4</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>_Default to the directory of the last read file for saving</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+5"/>
         <source>XVideo (best)</source>

avidemux_2.6.18.tar.gz/avidemux/qt4/i18n/avidemux_tr.ts -> avidemux_2.6.19.tar.gz/avidemux/qt4/i18n/avidemux_tr.ts Changed

@@ -2571,7 +2571,7 @@
         <translation type="obsolete">Eski bir endeks dosyasıyla ilgili olabilir.</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+222"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+229"/>
         <source>Attempt to open %s failed!</source>
         <translation type="unfinished">%s açma teşebbüsü başarısız oldu!</translation>
     </message>
@@ -3625,7 +3625,7 @@
         <translation type="obsolete">&lt;b&gt;Video&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+462"/>
+        <location line="+468"/>
         <location line="+169"/>
         <source>Copy</source>
         <translation type="unfinished">Kopyala</translation>
@@ -3639,7 +3639,12 @@
         <translation type="unfinished">Yapılandır</translation>
     </message>
     <message>
-        <location line="-334"/>
+        <location line="-592"/>
+        <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+258"/>
         <location line="+169"/>
         <source>Filters</source>
         <translation type="unfinished">Süzgeçler</translation>
@@ -3662,7 +3667,7 @@
              {0?}</translation>
     </message>
     <message>
-        <location line="+671"/>
+        <location line="+647"/>
         <source>00:00:00.000</source>
         <translation type="unfinished">00:00:00.000</translation>
     </message>
@@ -3673,7 +3678,7 @@
              {00:00:00.000?}</translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="+170"/>
         <location line="+10"/>
         <source>000000</source>
         <translation type="unfinished">000000</translation>
@@ -3707,13 +3712,13 @@
             </translation>
     </message>
     <message>
-        <location line="-137"/>
+        <location line="-131"/>
         <source>Frame type:</source>
         <translation type="unfinished">
             </translation>
     </message>
     <message>
-        <location line="-1284"/>
+        <location line="-1263"/>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3773,17 +3778,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+44"/>
         <source>Codec O&amp;ptions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;b&gt;Video Decoder&lt;b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+108"/>
         <location line="+7"/>
         <source>XXXX</source>
         <translation type="unfinished"></translation>
@@ -3820,12 +3820,12 @@
     </message>
     <message>
         <location line="+114"/>
-        <location line="+978"/>
+        <location line="+932"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-903"/>
+        <location line="-857"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3842,24 +3842,18 @@
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
-        <location line="+23"/>
         <location line="+26"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+26"/>
-        <location line="+352"/>
+        <location line="+345"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-637"/>
-        <source>Stop [SPACE]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+23"/>
+        <location line="-607"/>
         <source>Go to previous frame [LEFT]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3929,12 +3923,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+83"/>
+        <location line="+82"/>
         <source>?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+38"/>
         <source>Se&amp;lection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3964,7 +3958,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+84"/>
         <source>Audio &amp;Metre</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4699,18 +4693,17 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+210"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+217"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>_Use systray while encoding</source>
-        <translation type="unfinished">
+        <translation type="obsolete">
             </translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+10"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation type="unfinished">
             </translation>
@@ -4727,6 +4720,16 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>_Enable alternative keyboard shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Re_verse UP and DOWN arrow keys for navigation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+4"/>
         <source>SIMD</source>
         <translation type="unfinished">
@@ -4860,13 +4863,23 @@
             </translation>
     </message>
     <message>
+        <location line="+2"/>
+        <source>_Default to the directory of the last read file for saving</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>

avidemux_2.6.18.tar.gz/avidemux/qt4/i18n/avidemux_zh_TW.ts -> avidemux_2.6.19.tar.gz/avidemux/qt4/i18n/avidemux_zh_TW.ts Changed

@@ -3546,7 +3546,7 @@
         <translation type="obsolete">可能被關聯至一個舊的索引檔。</translation>
     </message>
     <message>
-        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+222"/>
+        <location filename="../../common/ADM_editor/src/ADM_edit.cpp" line="+229"/>
         <source>Attempt to open %s failed!</source>
         <translation type="unfinished">嘗試開啟 %s 失敗!</translation>
     </message>
@@ -5054,7 +5054,7 @@
         <translation type="obsolete">&lt;b&gt;視訊&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+462"/>
+        <location line="+468"/>
         <location line="+169"/>
         <source>Copy</source>
         <translation type="unfinished">複製</translation>
@@ -5068,7 +5068,12 @@
         <translation type="unfinished">設定</translation>
     </message>
     <message>
-        <location line="-334"/>
+        <location line="-592"/>
+        <source>&lt;b&gt;Video Decoder&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+258"/>
         <location line="+169"/>
         <source>Filters</source>
         <translation type="unfinished">濾鏡</translation>
@@ -5099,14 +5104,13 @@
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
-        <location line="+23"/>
         <location line="+26"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+23"/>
         <location line="+26"/>
-        <location line="+352"/>
+        <location line="+345"/>
         <source>...</source>
         <translation type="unfinished">...</translation>
     </message>
@@ -5123,12 +5127,12 @@
         <translation type="obsolete">/ 0</translation>
     </message>
     <message>
-        <location line="-297"/>
+        <location line="-290"/>
         <source>Time:</source>
         <translation type="unfinished">時間:</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+18"/>
         <source>00:00:00.000</source>
         <translation type="unfinished">00:00:00.000</translation>
     </message>
@@ -5151,7 +5155,7 @@
         <translation type="obsolete">選取</translation>
     </message>
     <message>
-        <location line="+117"/>
+        <location line="+111"/>
         <source>A:</source>
         <translation type="unfinished">A:</translation>
     </message>
@@ -5167,7 +5171,7 @@
         <translation type="unfinished">B:</translation>
     </message>
     <message>
-        <location line="-1421"/>
+        <location line="-1394"/>
         <source>&amp;Help</source>
         <translation type="unfinished">說明(&amp;H)</translation>
     </message>
@@ -5228,7 +5232,7 @@
         <translation type="obsolete">儲存(&amp;S)</translation>
     </message>
     <message>
-        <location line="+1568"/>
+        <location line="+1525"/>
         <source>&amp;Open...</source>
         <translation type="unfinished">開啟(&amp;O)...</translation>
     </message>
@@ -5760,12 +5764,12 @@
         <translation type="obsolete">DVD</translation>
     </message>
     <message>
-        <location line="-521"/>
+        <location line="-499"/>
         <source>Frame type:</source>
         <translation type="unfinished">畫格類型:</translation>
     </message>
     <message>
-        <location line="-1265"/>
+        <location line="-1244"/>
         <source>&amp;Toolbars</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5780,17 +5784,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+44"/>
         <source>Codec O&amp;ptions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;b&gt;Video Decoder&lt;b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+75"/>
+        <location line="+108"/>
         <location line="+7"/>
         <source>XXXX</source>
         <translation type="unfinished"></translation>
@@ -5817,12 +5816,12 @@
     </message>
     <message>
         <location line="+114"/>
-        <location line="+978"/>
+        <location line="+932"/>
         <source>&amp;Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-903"/>
+        <location line="-857"/>
         <source>Play [SPACE]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5833,11 +5832,6 @@
     </message>
     <message>
         <location line="+26"/>
-        <source>Stop [SPACE]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+23"/>
         <source>Go to previous frame [LEFT]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5902,7 +5896,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+185"/>
+        <location line="+178"/>
         <source>Se&amp;lection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5932,7 +5926,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+84"/>
         <source>Audio &amp;Metre</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6655,17 +6649,16 @@
 <context>
     <name>adm</name>
     <message>
-        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+210"/>
+        <location filename="../../common/ADM_commonUI/DIA_prefs.cpp" line="+217"/>
         <source>Decode video using DXVA2 (windows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
         <source>_Use systray while encoding</source>
-        <translation type="unfinished">編碼時使用工作欄(_U)</translation>
+        <translation type="obsolete">編碼時使用工作欄(_U)</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+10"/>
         <source>_Accept non-standard audio frequency for DVD</source>
         <translation type="unfinished">同意在 DVD 使用非標準的音訊頻率(_A)</translation>
     </message>
@@ -6680,6 +6673,16 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>_Enable alternative keyboard shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>

avidemux_2.6.18.tar.gz/avidemux/qt4/qt4PackageDebian.cmake -> avidemux_2.6.19.tar.gz/avidemux/qt4/qt4PackageDebian.cmake Changed

avidemux_2.6.19.tar.gz/avidemux2.appdata.xml Added

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<component type="desktop-application">
+    <id>avidemux2.desktop</id>
+    <metadata_license>CC0</metadata_license>
+    <name>Avidemux</name>
+    <summary>Multi-purpose video editing and processing software</summary>
+    <description>
+        <p>
+            Avidemux is a free open-source program designed for multi-purpose
+            video editing and processing, which can be used on almost all known
+            operating systems and computer platforms.
+        </p>
+    </description>
+    <categories>
+        <category>AudioVideo</category>
+        <category>AudioVideoEditing</category>
+        <category>Video</category>
+    </categories>
+    <url type="homepage">https://www.avidemux.org/</url>
+    <provides>
+        <binary>avidemux2_gtk</binary>
+    </provides>
+    <project_license>GPL-2.0+</project_license>
+    <update_contact>Avidemux team -- avidemux.org/smif/</update_contact>
+    <screenshots>
+        <screenshot type="default">http://fixounet.free.fr/avidemux/index_files/screenshot1.png</screenshot>
+        <screenshot type="default">http://fixounet.free.fr/avidemux/index_files/screenshot2.png</screenshot>
+    </screenshots>
+</component>

avidemux_2.6.18.tar.gz/avidemux_core/ADM_core/src/ADM_crashdump_mingw.cpp -> avidemux_2.6.19.tar.gz/avidemux_core/ADM_core/src/ADM_crashdump_mingw.cpp Changed

avidemux_2.6.18.tar.gz/avidemux_core/ADM_core/src/ADM_crashdump_unix.cpp -> avidemux_2.6.19.tar.gz/avidemux_core/ADM_core/src/ADM_crashdump_unix.cpp Changed

avidemux_2.6.18.tar.gz/avidemux_core/ADM_core/src/ADM_debug.cpp -> avidemux_2.6.19.tar.gz/avidemux_core/ADM_core/src/ADM_debug.cpp Changed

avidemux_2.6.18.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioIdentify.cpp -> avidemux_2.6.19.tar.gz/avidemux_core/ADM_coreAudio/src/ADM_audioIdentify.cpp Changed

@@ -18,6 +18,7 @@
 #include "ADM_audiodef.h"
 #include "ADM_mp3info.h"
 #include "ADM_a52info.h"
+#include "ADM_eac3info.h"
 #include "ADM_audioCodecEnum.h"
 #include "ADM_audioIdentify.h"
 #include "fourcc.h"
@@ -176,6 +177,41 @@
 	    return false;
 }
 /**
+ * \fn idEAC3
+ */
+static bool idEAC3(int bufferSize,const uint8_t *data,WAVHeader &oinfo,uint32_t &offset)
+{
+    uint32_t syncOffset;
+    ADM_EAC3_INFO info,info2;
+
+   if( !ADM_EAC3GetInfo(data,bufferSize, &syncOffset,&info))
+    {
+            ADM_info("Not EAC3\n");
+            return false;
+    };
+    // Need a 2nd packet...
+    const uint8_t *second=data+syncOffset;
+    int size2=bufferSize-syncOffset;
+    ADM_assert(size2>0);
+    ADM_info("Maybe EAC3... \n");
+    // Try on 2nd packet...
+    if( ADM_EAC3GetInfo(second,size2, &syncOffset,&info2))
+    {
+        if((info.frequency==info2.frequency) && (info.channels==info2.channels) && (info.byterate==info2.byterate))
+        {
+            ADM_warning("\tProbably EAC3 : Fq=%d br=%d chan=%d\n",(int)info.frequency,(int)info.byterate,(int)info.channels);
+            oinfo.encoding=WAV_EAC3;
+            oinfo.channels=info.channels;
+            oinfo.byterate=info.byterate; // already in bytes/sec
+            oinfo.frequency=info.frequency;
+            return true;
+        }
+    }
+    ADM_info("Cannot confirm EAC3\n");
+    return false; 
+}
+
+/**
     \fn idAC3
     \brief return true if the tracks is mp2
 */
@@ -270,6 +306,7 @@
     memset(&info,0,sizeof(info));
     if(idWAV(bufferSize,buffer,info,offset)) return true;
     if(idMP2(bufferSize,buffer,info,offset)) return true;
+    if(idEAC3(bufferSize,buffer,info,offset)) return true;
     if(idAAACADTS(bufferSize,buffer,info,offset)) return true;
     if(idAC3(bufferSize,buffer,info,offset)) return true;

avidemux_2.6.18.tar.gz/avidemux_core/ADM_coreAudioDevice/include/ADM_audiodevice.h -> avidemux_2.6.19.tar.gz/avidemux_core/ADM_coreAudioDevice/include/ADM_audiodevice.h Changed

avidemux_2.6.18.tar.gz/avidemux_core/ADM_coreAudioDevice/include/audio_out.h -> avidemux_2.6.19.tar.gz/avidemux_core/ADM_coreAudioDevice/include/audio_out.h Changed

avidemux_2.6.18.tar.gz/avidemux_core/ADM_coreAudioDevice/src/ADM_audiodevice.cpp -> avidemux_2.6.19.tar.gz/avidemux_core/ADM_coreAudioDevice/src/ADM_audiodevice.cpp Changed

avidemux_2.6.18.tar.gz/avidemux_core/ADM_coreAudioParser/include/ADM_eac3info.h -> avidemux_2.6.19.tar.gz/avidemux_core/ADM_coreAudioParser/include/ADM_eac3info.h Changed

avidemux_2.6.18.tar.gz/avidemux_core/ADM_coreAudioParser/src/ADM_eac3info.cpp -> avidemux_2.6.19.tar.gz/avidemux_core/ADM_coreAudioParser/src/ADM_eac3info.cpp Changed

avidemux_2.6.18.tar.gz/avidemux_core/ADM_coreImage/include/ADM_rgb.h -> avidemux_2.6.19.tar.gz/avidemux_core/ADM_coreImage/include/ADM_rgb.h Changed

avidemux_2.6.18.tar.gz/avidemux_core/ADM_coreImage/src/ADM_colorspace.cpp -> avidemux_2.6.19.tar.gz/avidemux_core/ADM_coreImage/src/ADM_colorspace.cpp Changed

avidemux_2.6.18.tar.gz/avidemux_core/ADM_coreMuxer/include/ADM_muxer.h -> avidemux_2.6.19.tar.gz/avidemux_core/ADM_coreMuxer/include/ADM_muxer.h Changed

avidemux_2.6.18.tar.gz/avidemux_core/ADM_coreMuxer/src/ADM_muxerUtils.cpp -> avidemux_2.6.19.tar.gz/avidemux_core/ADM_coreMuxer/src/ADM_muxerUtils.cpp Changed

@@ -18,7 +18,6 @@
 #include "ADM_muxerUtils.h"
 #include "fourcc.h"
 #include "ADM_vidMisc.h"
-#include "prefs.h"
 
 /**
     \fn rescaleFps
@@ -75,8 +74,11 @@
 {
         videoIncrement=vStream->getFrameIncrement();  // Video increment in AVI-Tick
         videoDuration=vStream->getVideoDuration();
-        ADM_info("Muxer, creating UI, video duration is %s\n",ADM_us2plain(videoDuration));
-        encoding=createEncoding(videoDuration);
+        if(!encoding)
+        {
+            ADM_info("Muxer, creating UI, video duration is %s\n",ADM_us2plain(videoDuration));
+            createUI(videoDuration);
+        }
         // Set video stream etc...
         encoding->setPhasis(title);
         encoding->setVideoCodec(fourCC::tostring(vStream->getFCC()));
@@ -85,6 +87,17 @@
                 else    encoding->setAudioCodec(getStrFromAudioCodec(aStreams[0]->getInfo()->encoding));
         return true;
 }
+
+/**
+    \fn createUI
+    \brief create an encoding dialog / progress indicator
+*/
+bool ADM_muxer::createUI(uint64_t duration)
+{
+    encoding=createEncoding(duration);
+    return true;
+}
+
 /**
         \fn updateUI
         \brief Update the progress bar

avidemux_2.6.18.tar.gz/avidemux_core/ADM_coreUI/include/DIA_encoding.h -> avidemux_2.6.19.tar.gz/avidemux_core/ADM_coreUI/include/DIA_encoding.h Changed

@@ -51,6 +51,7 @@
                 uint32_t  _originalPriority;
                 encodingSample samples[ADM_ENCODING_SAMPLE];
                 uint32_t  sampleIndex;
+                uint32_t  percent;
         
 public:
                              DIA_encodingBase(uint64_t duration);
@@ -65,14 +66,13 @@
                 virtual void setTotalSize(uint64_t size)=0;
                 virtual void setFrameCount(uint32_t nb)=0;
                 virtual void setElapsedTimeMs(uint32_t nb)=0;
-                virtual void setRemainingTimeMS(uint32_t nb)=0;
                 virtual void setAverageQz(uint32_t nb)=0;
                 virtual void setAverageBitrateKbits(uint32_t kb)=0;
             
 
 public:
                 virtual void setPercent(uint32_t percent)=0;
-public:
+                virtual void setRemainingTimeMS(uint32_t nb)=0;
                 virtual void setPhasis(const char *n)=0;
                 virtual void setVideoCodec(const char *n)=0;
                 virtual void setAudioCodec(const char *n)=0;

avidemux_2.6.18.tar.gz/avidemux_core/ADM_coreUI/src/DIA_encoding.cpp -> avidemux_2.6.19.tar.gz/avidemux_core/ADM_coreUI/src/DIA_encoding.cpp Changed

@@ -61,6 +61,7 @@
         _fps_average=0;
         _remainingTimeUs=0;
         sampleIndex=0;
+        percent=0;
         memset(samples,0,sizeof(samples));
         clock.reset();
         UI_purge();
@@ -138,10 +139,12 @@
                     _fps_average=_fps_average*0.5+0.5*thisAverage;
                     //printf("************** Fps:%d\n",(int)_fps_average);
                     setFps(_fps_average);
-                    float percent=(float)_currentDts/(float)_totalDurationUs;
-                    if(percent>1.0) percent=1.0;
-                    percent*=100;
-                    setPercent((uint32_t)percent);
+                    float p=(float)_currentDts/(float)_totalDurationUs;
+                    if(p>1.0) p=1.0;
+                    p*=100;
+                    if(percent<(uint32_t)p)
+                        percent=(uint32_t)p; // avoid progress bar going backwards
+                    setPercent(percent);
                     setFrameCount(_currentFrameCount);
                     setElapsedTimeMs(time);
                 }

avidemux_2.6.18.tar.gz/avidemux_core/ADM_coreUtils/include/ADM_h265_tag.h -> avidemux_2.6.19.tar.gz/avidemux_core/ADM_coreUtils/include/ADM_h265_tag.h Changed

@@ -1,5 +1,5 @@
 /***************************************************************************
-                      NAL TYPE for H265
+                      NAL TYPE for H264
                       
 **************************************************************************/
 /***************************************************************************
@@ -10,17 +10,48 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#ifndef ADM_H265_TAG_H
-#define	ADM_H265_TAG_H
-#define H265_NAL_IDR_W          19
-#define H265_NAL_IDR_N          20
-#define H265_NAL_SPS            33
-#define H265_NAL_PPS            34
-#define H265_NAL_AU_DELIMITER   35
-#define H265_NAL_FD             38
-#define H265_NAL_PREFIX_SEI     39
-#define H265_NAL_SUFIX_SEI      40
+#pragma once
 
+#define LIST_OF_NAL_TYPE\
+    NAME(NAL_H265_TRAIL_N,      0)    , \
+    NAME(NAL_H265_TRAIL_R,      1)    , \
+    NAME(NAL_H265_TSA_N      , 2),\
+    NAME(NAL_H265_TSA_R      , 3),\
+    NAME(NAL_H265_STSA_N     , 4),\
+    NAME(NAL_H265_STSA_R     , 5),\
+    NAME(NAL_H265_RADL_N     , 6),\
+    NAME(NAL_H265_RADL_R     , 7),\
+    NAME(NAL_H265_RASL_N     , 8),\
+    NAME(NAL_H265_RASL_R     , 9),\
+    NAME(NAL_H265_BLA_W_LP   , 16),\
+    NAME(NAL_H265_BLA_W_RADL , 17),\
+    NAME(NAL_H265_BLA_N_LP   , 18),\
+    NAME(NAL_H265_IDR_W_RADL , 19),\
+    NAME(NAL_H265_IDR_N_LP,     20) , \
+    NAME(NAL_H265_CRA_NUT    ,  21),\
+    NAME(NAL_H265_IRAP_VCL23 ,  23),\
+    NAME(NAL_H265_VPS  ,        32)    ,\
+    NAME(NAL_H265_SPS  ,        33)    ,\
+    NAME(NAL_H265_PPS  ,        34)    ,\
+    NAME(NAL_H265_AUD  ,        35)    ,\
+    NAME(NAL_H265_FD_NUT  ,        38)    ,\
+    NAME(NAL_H265_SEI_PREFIX,   39),\
+    NAME(NAL_H265_SEI_SUFFIX,   40),\
 
-#endif	/* ADM_H265_TAG_H */
 
+#define NAME(x,y) x= y
+
+enum{
+LIST_OF_NAL_TYPE
+};
+#undef NAME
+#define NAME(x,y) {y,#x}
+
+typedef struct NAL_DESC{int value; const char *name;}NAL_DESC;
+
+const NAL_DESC nalDesc[]={
+    LIST_OF_NAL_TYPE
+};
+    
+
+//EOF

avidemux_2.6.18.tar.gz/avidemux_core/ADM_coreUtils/include/ADM_last.h -> avidemux_2.6.19.tar.gz/avidemux_core/ADM_coreUtils/include/ADM_last.h Changed

avidemux_2.6.18.tar.gz/avidemux_core/ADM_coreUtils/include/ADM_videoInfoExtractor.h -> avidemux_2.6.19.tar.gz/avidemux_core/ADM_coreUtils/include/ADM_videoInfoExtractor.h Changed

@@ -17,6 +17,7 @@
 
 #include "ADM_coreUtils6_export.h"
 
+
 ADM_COREUTILS6_EXPORT uint8_t extractMpeg4Info(uint8_t *data,uint32_t dataSize,uint32_t *w,uint32_t *h,uint32_t *time_inc);
 ADM_COREUTILS6_EXPORT uint8_t extractH263Info(uint8_t *data,uint32_t dataSize,uint32_t *w,uint32_t *h);
 ADM_COREUTILS6_EXPORT uint8_t extractH263FLVInfo (uint8_t * buffer, uint32_t len, uint32_t * w, uint32_t * h);
@@ -36,16 +37,48 @@
     uint32_t CpbDpbToSkip;
 }ADM_SPSInfo;
 
-ADM_COREUTILS6_EXPORT uint8_t extractSPSInfo(uint8_t *data, uint32_t len,ADM_SPSInfo *info);
-ADM_COREUTILS6_EXPORT bool extractSPSInfo_mp4Header(uint8_t *data, uint32_t len,ADM_SPSInfo *info);
+/**
+    \struct ADM_SPSinfoH265
+*/
+class ADM_COREUTILS6_EXPORT ADM_SPSinfoH265
+{
+public:
+    ADM_SPSinfoH265()
+    {
+      width=height=fps1000=0;
+      num_extra_slice_header_bits=0;  //copied from pps
+      address_coding_length=0;
+    }
+    int     width;
+    int     height;
+    int     fps1000;
+    int     num_extra_slice_header_bits;
+    bool    dependent_slice_segments_enabled_flag;
+    int     address_coding_length;
+};
+
+
+
+ADM_COREUTILS6_EXPORT bool    ADM_SPSannexBToMP4(uint32_t dataLen,uint8_t *incoming, uint32_t *outLen, uint8_t *outData);
+
+ADM_COREUTILS6_EXPORT bool    extractSPSInfo(uint8_t *data, uint32_t len,ADM_SPSInfo *info);
+ADM_COREUTILS6_EXPORT bool    extractSPSInfo_mp4Header(uint8_t *data, uint32_t len,ADM_SPSInfo *info);
 
 ADM_COREUTILS6_EXPORT uint8_t extractH264FrameType(uint32_t nalSize,uint8_t *buffer,uint32_t len,uint32_t *flags);
 ADM_COREUTILS6_EXPORT uint8_t extractH265FrameType(uint32_t nalSize,uint8_t *buffer,uint32_t len,uint32_t *flags);
-uint8_t extractH264FrameType_startCode(uint32_t nalSize,uint8_t *buffer,uint32_t len,uint32_t *flags);
+ADM_COREUTILS6_EXPORT uint8_t extractH264FrameType_startCode(uint32_t nalSize,uint8_t *buffer,uint32_t len,uint32_t *flags);
 ADM_COREUTILS6_EXPORT bool    ADM_getH264SpsPpsFromExtraData(uint32_t extraLen,uint8_t *extra,
                                     uint32_t *spsLen,uint8_t **spsData,
                                     uint32_t *ppsLen,uint8_t **ppsData); // return a copy of pps/sps extracted
 
+
+ADM_COREUTILS6_EXPORT bool    extractSPSInfoH265_mp4Header(uint8_t *data, uint32_t len,ADM_SPSinfoH265 *info); 
+ADM_COREUTILS6_EXPORT bool    extractSPSInfoH265(uint8_t *data, uint32_t len,ADM_SPSinfoH265 *info); 
+
+
+
+
+
 typedef struct
 {
     uint8_t  *start;
@@ -55,7 +88,8 @@
 ADM_COREUTILS6_EXPORT int ADM_splitNalu(uint8_t *start, uint8_t *end, uint32_t maxNalu,NALU_descriptor *desc);
 ADM_COREUTILS6_EXPORT int ADM_findNalu(uint32_t nalu,uint32_t maxNalu,NALU_descriptor *desc);
 ADM_COREUTILS6_EXPORT int ADM_convertFromAnnexBToMP4(uint8_t *inData,uint32_t inSize, uint8_t *outData,uint32_t outMaxSize);
-
+ADM_COREUTILS6_EXPORT int     ADM_splitNaluH265(uint8_t *start, uint8_t *end, uint32_t maxNalu,NALU_descriptor *desc);
+ADM_COREUTILS6_EXPORT NALU_descriptor *ADM_findNaluH265(uint32_t nalu,uint32_t maxNalu,NALU_descriptor *desc);
 #define SHORT_START_CODE
 
 #ifdef SHORT_START_CODE

avidemux_2.6.18.tar.gz/avidemux_core/ADM_coreUtils/include/prefs2_list.h -> avidemux_2.6.19.tar.gz/avidemux_core/ADM_coreUtils/include/prefs2_list.h Changed

avidemux_2.6.18.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_infoExtractor.cpp -> avidemux_2.6.19.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_infoExtractor.cpp Changed

avidemux_2.6.18.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_infoExtractorH264.cpp -> avidemux_2.6.19.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_infoExtractorH264.cpp Changed

@@ -54,7 +54,7 @@
     \fn ADM_getH264SpsPpsFromExtraData
     \brief Returns a copy of PPS/SPS extracted from extrdata
 */
-static bool ADM_SPSannexBToMP4(uint32_t dataLen,uint8_t *incoming,
+bool ADM_SPSannexBToMP4(uint32_t dataLen,uint8_t *incoming,
                                     uint32_t *outLen, uint8_t *outData)
 {
     if(dataLen>200)
@@ -787,7 +787,7 @@
     ADM_info("Incoming SPS info\n");
     mixDump(data,len);
 
-    ADM_info("\nconverted SPS info\n");
+    ADM_info("converted SPS info\n");
 
     uint32_t converted;
     uint8_t buffer[256];
@@ -797,12 +797,11 @@
         return false;
     }
     mixDump(buffer,converted);
-    ADM_info("\n");
     return    extractSPSInfo_mp4Header(buffer,converted,spsinfo) ;
 
 }
 
-uint8_t extractSPSInfo (uint8_t * data, uint32_t len, ADM_SPSInfo *spsinfo)
+bool  extractSPSInfo (uint8_t * data, uint32_t len, ADM_SPSInfo *spsinfo)
 {
 #define DPY(x) ADM_info(#x":%d\n",(int)spsinfo->x);
 #if 1
@@ -959,6 +958,7 @@
     index++;
     return index;
 }
+
 /**
     \fn ADM_findNalu
     \brief lookup for a specific NALU in the given buffer
@@ -972,7 +972,6 @@
     }
     return -1;
 }
-
 static void writeBE32(uint8_t *p, uint32_t size)
 {
     p[0]=size>>24;

avidemux_2.6.18.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_infoExtractorH265.cpp -> avidemux_2.6.19.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_infoExtractorH265.cpp Changed

@@ -24,76 +24,307 @@
 #define aprintf(...) {}
 #include "ADM_getbits.h"
 #include "ADM_videoInfoExtractor.h"
-#include "ADM_h265_tag.h"
+
+
+
+extern "C"
+{
+#include "libavcodec/parser.h"
+#include "libavcodec/hevc.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/ff_spsinfo.h"
+}
+
+extern "C"
+{
+extern  HEVCSPS *ff_hevc_parser_get_sps(AVCodecParserContext *parser);
+extern  HEVCPPS *ff_hevc_parser_get_pps(AVCodecParserContext *parser);
+extern  HEVCVPS *ff_hevc_parser_get_vps(AVCodecParserContext *parser);
+   
+
+}
+
+#include "../include/ADM_h265_tag.h"
+
+extern bool ADM_SPSannexBToMP4(uint32_t dataLen,uint8_t *incoming,
+                                    uint32_t *outLen, uint8_t *outData);
+extern bool ADM_findMpegStartCode (uint8_t * start, uint8_t * end,
+                uint8_t * outstartcode, uint32_t * offset);
+
 
 /**
-      \fn extractH265FrameType
-      \brief return frametype in flags (KEY_FRAME or 0). 
-             To be used only with  mkv/mp4 nal type (i.e. no startcode)
-                    but 4 bytes NALU
-      
-*/
-uint8_t extractH265FrameType (uint32_t nalSize, uint8_t * buffer, uint32_t len,  uint32_t * flags)
+ */
+class H265Parser
 {
-  uint8_t *head = buffer, *tail = buffer + len;
-  uint8_t stream;
-
-  uint32_t val, hnt;
-  nalSize=4;
-// Check for short nalSize, i.e. size coded on 3 bytes
-  {
-      uint32_t length =(head[0] << 24) + (head[1] << 16) + (head[2] << 8) + (head[3]);
-      if(length>len)
-      {
-          nalSize=3;
-      }
-  }
-  uint32_t recovery=0xff;
-  *flags=0;
-  while (head + nalSize < tail)
+public : 
+    H265Parser  (int len,uint8_t *data);
+    ~H265Parser();
+    bool parseAnnexB(ADM_SPSinfoH265 *spsinfo);
+    bool parseMpeg4(ADM_SPSinfoH265 *spsinfo);    
+    bool init();
+
+protected:
+    int myLen,originalLength;
+    uint8_t *myData;
+    AVCodecParserContext *parser;
+    AVCodecContext *ctx;
+    AVCodec *codec;
+};
+
+
+H265Parser::H265Parser  (int len,uint8_t *data)
+{
+    originalLength=len;
+    myLen=len+FF_INPUT_BUFFER_PADDING_SIZE;
+    myData=new uint8_t[myLen];
+    memset(myData,0x2,myLen);
+    memcpy(myData,data,len);
+    parser=NULL;
+    ctx=NULL;
+    codec=NULL;
+}
+H265Parser::~H265Parser()
+{
+    if(myData)
+    {
+        delete [] myData;
+        myData=NULL;
+    }
+    //-
+    if(ctx)
+    {
+        avcodec_close(ctx);
+        av_free(ctx);
+        ctx=NULL;
+    }    
+    if(parser)
     {
+        av_parser_close(parser);
+        parser=NULL;
+    }
+    
+}
 
-      uint32_t length =(head[0] << 16) + (head[1] << 8) + (head[2] << 0) ;
-      if(nalSize==4)
-          length=(length<<8)+head[3];
-      if (length > len)// || length < 2)
-      {
-          ADM_warning ("Warning , incomplete nal (%u/%u),(%0x/%0x)\n", length, len, length, len);
-          *flags = 0;
-          return 0;
-        }
-      head += nalSize;		// Skip nal lenth
-      
-      stream = ((*head)>>1) & 0x3F;
-      
+bool H265Parser::init()
+{
+     parser=av_parser_init(AV_CODEC_ID_HEVC);
+    if(!parser)
+    {
+        ADM_error("cannot create h265 parser\n");
+        return false;;
+    }
+    ADM_info("Parser created\n");
+    codec=avcodec_find_decoder(AV_CODEC_ID_HEVC);
+    if(!codec)
+    {
+        ADM_error("cannot create h265 codec\n");
+        return false;;
+    }
+    ADM_info("Codec created\n");
+    ctx=avcodec_alloc_context3(codec);
+   if (avcodec_open2(ctx, codec, NULL) < 0)
+   {
+        ADM_error("cannot create h265 context\n");
+        return false;;
+    }
+    parser->flags|=PARSER_FLAG_COMPLETE_FRAMES;
+    return true;
+}
+/**
+ * 
+ * @return 
+ */
+bool H265Parser::parseMpeg4(ADM_SPSinfoH265 *spsinfo)
+{
+    uint8_t *outptr=NULL;
+    int outsize=0;
 
-      switch (stream)
-        {
-            case H265_NAL_PREFIX_SEI:
-            case H265_NAL_SUFIX_SEI:
-                //getRecoveryFromSei(length-1, head+1,&recovery);
-                break;
-            case H265_NAL_SPS:
-            case H265_NAL_PPS: 
-            case H265_NAL_AU_DELIMITER:
-            case H265_NAL_FD:
-                    break;
-            case H265_NAL_IDR_W:
-            case H265_NAL_IDR_N:
-              *flags = AVI_KEY_FRAME;
-              return 1;
-              break;
-            /*case NAL_NON_IDR:
-              getNalType(head+1,head+length,flags,recovery);
-              return 1;
-              break;*/
-            default:
-              ADM_warning ("unknown nal ??0x%x\n", stream);
-              break;
+    ctx->extradata=myData;
+    ctx->extradata_size=myLen;
+    int used=av_parser_parse2(parser, ctx, &outptr, &outsize, NULL, 0, 0, 0,0);
+    printf("Used bytes %d, total = %d, outsize=%d (+5)\n",used,myLen,outsize);
+    if(!used)
+    {
+        ADM_warning("Failed to extract SPS info\n");
+        return false;
+    }
+    return  true;
+}
+
+static int bitsNeeded(int v)
+{
+    int b=1;
+    while(v)
+    {
+        v>>=1;
+        b++;
+    }
+    return b;

avidemux_2.6.18.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_last.cpp -> avidemux_2.6.19.tar.gz/avidemux_core/ADM_coreUtils/src/ADM_last.cpp Changed

avidemux_2.6.18.tar.gz/avidemux_core/ADM_coreUtils/src/avidemutils.cpp -> avidemux_2.6.19.tar.gz/avidemux_core/ADM_coreUtils/src/avidemutils.cpp Changed

avidemux_2.6.18.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2.conf -> avidemux_2.6.19.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2.conf Changed

avidemux_2.6.18.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2.h -> avidemux_2.6.19.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2.h Changed

avidemux_2.6.18.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2_desc.cpp -> avidemux_2.6.19.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2_desc.cpp Changed

@@ -19,6 +19,16 @@
  {"features.cap_refresh_enabled",offsetof(my_prefs_struct,features.cap_refresh_enabled),"bool",ADM_param_bool},
  {"features.cap_refresh_value",offsetof(my_prefs_struct,features.cap_refresh_value),"uint32_t",ADM_param_uint32_t},
  {"features.sdlDriver",offsetof(my_prefs_struct,features.sdlDriver),"std::string",ADM_param_stdstring},
+ {"features.use_last_read_dir_as_target",offsetof(my_prefs_struct,features.use_last_read_dir_as_target),"bool",ADM_param_bool},
+ {"keyboard_shortcuts.use_alternate_kbd_shortcuts",offsetof(my_prefs_struct,keyboard_shortcuts.use_alternate_kbd_shortcuts),"bool",ADM_param_bool},
+ {"keyboard_shortcuts.swap_up_down_keys",offsetof(my_prefs_struct,keyboard_shortcuts.swap_up_down_keys),"bool",ADM_param_bool},
+ {"keyboard_shortcuts.alt_mark_a",offsetof(my_prefs_struct,keyboard_shortcuts.alt_mark_a),"std::string",ADM_param_stdstring},
+ {"keyboard_shortcuts.alt_mark_b",offsetof(my_prefs_struct,keyboard_shortcuts.alt_mark_b),"std::string",ADM_param_stdstring},
+ {"keyboard_shortcuts.alt_reset_markers",offsetof(my_prefs_struct,keyboard_shortcuts.alt_reset_markers),"std::string",ADM_param_stdstring},
+ {"keyboard_shortcuts.alt_goto_mark_a",offsetof(my_prefs_struct,keyboard_shortcuts.alt_goto_mark_a),"std::string",ADM_param_stdstring},
+ {"keyboard_shortcuts.alt_goto_mark_b",offsetof(my_prefs_struct,keyboard_shortcuts.alt_goto_mark_b),"std::string",ADM_param_stdstring},
+ {"keyboard_shortcuts.alt_begin",offsetof(my_prefs_struct,keyboard_shortcuts.alt_begin),"std::string",ADM_param_stdstring},
+ {"keyboard_shortcuts.alt_end",offsetof(my_prefs_struct,keyboard_shortcuts.alt_end),"std::string",ADM_param_stdstring},
  {"update.enabled",offsetof(my_prefs_struct,update.enabled),"bool",ADM_param_bool},
  {"update.lastCheck",offsetof(my_prefs_struct,update.lastCheck),"uint32_t",ADM_param_uint32_t},
  {"lastfiles.lastdir_read",offsetof(my_prefs_struct,lastfiles.lastdir_read),"std::string",ADM_param_stdstring},

avidemux_2.6.18.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2_json.cpp -> avidemux_2.6.19.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2_json.cpp Changed

@@ -27,6 +27,18 @@
 json.addBool("cap_refresh_enabled",key->features.cap_refresh_enabled);
 json.addUint32("cap_refresh_value",key->features.cap_refresh_value);
 json.addString("sdlDriver",key->features.sdlDriver);
+json.addBool("use_last_read_dir_as_target",key->features.use_last_read_dir_as_target);
+json.endNode();
+json.addNode("keyboard_shortcuts");
+json.addBool("use_alternate_kbd_shortcuts",key->keyboard_shortcuts.use_alternate_kbd_shortcuts);
+json.addBool("swap_up_down_keys",key->keyboard_shortcuts.swap_up_down_keys);
+json.addString("alt_mark_a",key->keyboard_shortcuts.alt_mark_a);
+json.addString("alt_mark_b",key->keyboard_shortcuts.alt_mark_b);
+json.addString("alt_reset_markers",key->keyboard_shortcuts.alt_reset_markers);
+json.addString("alt_goto_mark_a",key->keyboard_shortcuts.alt_goto_mark_a);
+json.addString("alt_goto_mark_b",key->keyboard_shortcuts.alt_goto_mark_b);
+json.addString("alt_begin",key->keyboard_shortcuts.alt_begin);
+json.addString("alt_end",key->keyboard_shortcuts.alt_end);
 json.endNode();
 json.addNode("update");
 json.addBool("enabled",key->update.enabled);

avidemux_2.6.18.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2_pref.h -> avidemux_2.6.19.tar.gz/avidemux_core/ADM_coreUtils/src/prefs2_pref.h Changed

@@ -30,6 +30,16 @@
 { FEATURES_CAP_REFRESH_ENABLED,"features.cap_refresh_enabled"         ,ADM_param_bool    	,"0",	0,	1},
 { FEATURES_CAP_REFRESH_VALUE,"features.cap_refresh_value"             ,ADM_param_uint32_t	,"100",	10,	1000},
 { FEATURES_SDLDRIVER,"features.sdlDriver"                             ,ADM_param_stdstring  	,"",	0,	0},
+{ FEATURES_USE_LAST_READ_DIR_AS_TARGET,"features.use_last_read_dir_as_target",ADM_param_bool    	,"0",	0,	1},
+{ KEYBOARD_SHORTCUTS_USE_ALTERNATE_KBD_SHORTCUTS,"keyboard_shortcuts.use_alternate_kbd_shortcuts",ADM_param_bool    	,"0",	0,	1},
+{ KEYBOARD_SHORTCUTS_SWAP_UP_DOWN_KEYS,"keyboard_shortcuts.swap_up_down_keys",ADM_param_bool    	,"0",	0,	1},
+{ KEYBOARD_SHORTCUTS_ALT_MARK_A,"keyboard_shortcuts.alt_mark_a"       ,ADM_param_stdstring  	,"I",	0,	0},
+{ KEYBOARD_SHORTCUTS_ALT_MARK_B,"keyboard_shortcuts.alt_mark_b"       ,ADM_param_stdstring  	,"O",	0,	0},
+{ KEYBOARD_SHORTCUTS_ALT_RESET_MARKERS,"keyboard_shortcuts.alt_reset_markers",ADM_param_stdstring  	,"R",	0,	0},
+{ KEYBOARD_SHORTCUTS_ALT_GOTO_MARK_A,"keyboard_shortcuts.alt_goto_mark_a",ADM_param_stdstring  	,"A",	0,	0},
+{ KEYBOARD_SHORTCUTS_ALT_GOTO_MARK_B,"keyboard_shortcuts.alt_goto_mark_b",ADM_param_stdstring  	,"B",	0,	0},
+{ KEYBOARD_SHORTCUTS_ALT_BEGIN,"keyboard_shortcuts.alt_begin"         ,ADM_param_stdstring  	,"S",	0,	0},
+{ KEYBOARD_SHORTCUTS_ALT_END,"keyboard_shortcuts.alt_end"             ,ADM_param_stdstring  	,"E",	0,	0},
 { UPDATE_ENABLED,"update.enabled"                                     ,ADM_param_bool    	,"1",	0,	1},
 { UPDATE_LASTCHECK,"update.lastCheck"                                 ,ADM_param_uint32_t	,"0",	0,	5000},
 { LASTFILES_LASTDIR_READ,"lastfiles.lastdir_read"                     ,ADM_param_stdstring  	,"",	0,	0},

avidemux_2.6.18.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreDxva2/include/ADM_coreDxva2.h -> avidemux_2.6.19.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreDxva2/include/ADM_coreDxva2.h Changed

@@ -33,7 +33,7 @@
     void                 *parent;
     LPDIRECT3DSURFACE9    surface;
     IDirectXVideoDecoder *decoder;
-
+    ADMColorScalerSimple *color10Bits; // To be optimized, it's the same for all images from the same source
     bool                  surfaceToAdmImage(ADMImage *out);
     int                   refCount;
 public:
@@ -51,15 +51,14 @@
         static bool init(GUI_WindowInfo *x);
         static bool isOperationnal(void);
         static bool cleanup(void);
-        static bool supported(AVCodecID codec);
-        static IDirectXVideoDecoder *createDecoder(AVCodecID codec,int width, int height,int numSurface, LPDIRECT3DSURFACE9 *surface,int align);
+        static bool supported(AVCodecID codec,int bits);
+        static IDirectXVideoDecoder *createDecoder(AVCodecID codec,int width, int height,int numSurface, LPDIRECT3DSURFACE9 *surface,int align,int bits);
         static bool destroyDecoder(IDirectXVideoDecoder *decoder);
-        static DXVA2_ConfigPictureDecode *getDecoderConfig(AVCodecID codec);
-        static bool allocateD3D9Surface(int num,int width, int height,void *array,int align);
+        static DXVA2_ConfigPictureDecode *getDecoderConfig(AVCodecID codec,int bits);
+        static bool allocateD3D9Surface(int num,int width, int height,void *array,int align,int bits=8);
         static bool destroyD3DSurface(int num,void *surfaces);
         static bool decoderAddRef(IDirectXVideoDecoder *decoder);
         static bool decoderRemoveRef(IDirectXVideoDecoder *decoder);
 };
 
 bool ADM_COREVIDEOCODEC6_EXPORT admDxva2_exitCleanup(void);
-

avidemux_2.6.18.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreDxva2/src/ADM_coreDxva2.cpp -> avidemux_2.6.19.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreDxva2/src/ADM_coreDxva2.cpp Changed

@@ -61,6 +61,7 @@
 DEFINE_GUID(DXVA2_ModeHEVC_VLD_Main,  0x5b11d51b, 0x2f4c,0x4452,0xbc,0xc3,0x09,0xf2,0xa1,0x16,0x0c,0xc0);
 DEFINE_GUID(DXVA2_ModeVP9_VLD_Profile0, 0x463707f8, 0xa1d0,0x4585,0x87,0x6d,0x83,0xaa,0x6d,0x60,0xb8,0x9e);
 DEFINE_GUID(DXVA2_NoEncrypt,          0x1b81beD0, 0xa0c7,0x11d3,0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
+DEFINE_GUID(DXVA2_ModeHEVC_VLD_Main10,0x107af0e0, 0xef1a,0x4d19,0xab,0xa8,0x67,0xa1,0x63,0x07,0x3d,0x13);
 DEFINE_GUID(GUID_NULL,                0x00000000, 0x0000,0x0000,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00);
 /**
  */
@@ -68,6 +69,7 @@
 {
   const GUID     *guid;
   enum AVCodecID codec;
+  int            bitsPerChannel;
 } dxva2_mode;
 /**
  */
@@ -83,28 +85,29 @@
 static const dxva2_mode dxva2_modes[] =
 {
     /* MPEG-2 */
-    { &DXVA2_ModeMPEG2_VLD,      AV_CODEC_ID_MPEG2VIDEO },
-    { &DXVA2_ModeMPEG2and1_VLD,  AV_CODEC_ID_MPEG2VIDEO },
+    { &DXVA2_ModeMPEG2_VLD,      AV_CODEC_ID_MPEG2VIDEO ,8},
+    { &DXVA2_ModeMPEG2and1_VLD,  AV_CODEC_ID_MPEG2VIDEO ,8},
 
     /* H.264 */
-    { &DXVA2_ModeH264_F,         AV_CODEC_ID_H264 },
-    { &DXVA2_ModeH264_E,         AV_CODEC_ID_H264 },
+    { &DXVA2_ModeH264_F,         AV_CODEC_ID_H264 ,8},
+    { &DXVA2_ModeH264_E,         AV_CODEC_ID_H264 ,8},
     /* Intel specific H.264 mode */
-    { &DXVADDI_Intel_ModeH264_E, AV_CODEC_ID_H264 },
+    { &DXVADDI_Intel_ModeH264_E, AV_CODEC_ID_H264 ,8},
 
     /* VC-1 / WMV3 */
-    { &DXVA2_ModeVC1_D2010,      AV_CODEC_ID_VC1  },
-    { &DXVA2_ModeVC1_D2010,      AV_CODEC_ID_WMV3 },
-    { &DXVA2_ModeVC1_D,          AV_CODEC_ID_VC1  },
-    { &DXVA2_ModeVC1_D,          AV_CODEC_ID_WMV3 },
+    { &DXVA2_ModeVC1_D2010,      AV_CODEC_ID_VC1  ,8},
+    { &DXVA2_ModeVC1_D2010,      AV_CODEC_ID_WMV3 ,8},
+    { &DXVA2_ModeVC1_D,          AV_CODEC_ID_VC1  ,8},
+    { &DXVA2_ModeVC1_D,          AV_CODEC_ID_WMV3 ,8},
 
     /* HEVC/H.265 */
-    { &DXVA2_ModeHEVC_VLD_Main,  AV_CODEC_ID_HEVC },
+    { &DXVA2_ModeHEVC_VLD_Main,   AV_CODEC_ID_HEVC ,8},
+    { &DXVA2_ModeHEVC_VLD_Main10, AV_CODEC_ID_HEVC ,10},
 
     /* VP8/9 */
-    { &DXVA2_ModeVP9_VLD_Profile0, AV_CODEC_ID_VP9 },
+    { &DXVA2_ModeVP9_VLD_Profile0,AV_CODEC_ID_VP9 ,8},
 
-    { NULL,                      (AVCodecID)0 },
+    { NULL,                      (AVCodecID)0 ,0},
 };
 typedef struct
 {
@@ -118,6 +121,23 @@
 
 static Dxv2SupportMap dxva2H265={AV_CODEC_ID_HEVC,false};
 static Dxv2SupportMap dxva2H264={AV_CODEC_ID_H264,false};
+static Dxv2SupportMap dxva2H265_10Bits={AV_CODEC_ID_HEVC,false};
+
+/**
+  \fn dxvaBitsToFormat
+  \brief returns D3D format depending on bits per component
+*/
+static D3DFORMAT dxvaBitsToFormat(int bits)
+{
+  switch(bits)
+  {
+    case 8: return (D3DFORMAT)MKTAG('N','V','1','2');break;
+    case 10:return (D3DFORMAT)MKTAG('P','0','1','0');break;
+    default:
+        ADM_assert(0); break;
+  }
+  return (D3DFORMAT)MKTAG('N','V','1','2');
+}
 /**
  */
 static void dumpGUID(const char *name,const GUID &guid)
@@ -206,7 +226,7 @@
  * \fn lookupCodec
  * \brief find and populate the configuration for a given codec
  */
-static bool lookupCodec(const char *codecName,Dxv2SupportMap *context,unsigned int guid_count,GUID *guid_list)
+static bool lookupCodec(const char *codecName,Dxv2SupportMap *context,unsigned int guid_count,GUID *guid_list, int bitsPerComponent)
 {
     HRESULT hr;
     D3DFORMAT target_format = (D3DFORMAT) 0;
@@ -236,10 +256,12 @@
         {
             continue;
         }
+        D3DFORMAT tgt;
+        tgt=dxvaBitsToFormat(bitsPerComponent);
         for (j = 0; j < target_count; j++)
         {
             const D3DFORMAT format = target_list[j];
-            if (format == MKTAG('N','V','1','2'))
+            if (format ==tgt)
             {
                 target_format = format;
                 break;
@@ -344,8 +366,9 @@
             ADM_warning("Failed to retrieve decoder device GUIDs\n");
             goto failInit;
         }
-        lookupCodec("H264",&dxva2H264,guid_count,guid_list);
-        lookupCodec("H265",&dxva2H265,guid_count,guid_list);
+        lookupCodec("H264",&dxva2H264,guid_count,guid_list,8);
+        lookupCodec("H265",&dxva2H265,guid_count,guid_list,8);
+        lookupCodec("H265",&dxva2H265_10Bits,guid_count,guid_list,10);
         CoTaskMemFree(guid_list);
     }
     ADM_info("Scanning supported format done\n");
@@ -357,18 +380,20 @@
 }
 /**
  */
-bool admDxva2::allocateD3D9Surface(int num,int w, int h,void *array,int surface_alignment)
+bool admDxva2::allocateD3D9Surface(int num,int w, int h,void *array,int surface_alignment,int bits)
 {
     HRESULT hr;
     LPDIRECT3DSURFACE9 *surfaces=(LPDIRECT3DSURFACE9 *)array;
     int width=ALIGN(w,surface_alignment);
     int height=ALIGN(h,surface_alignment);
+    D3DFORMAT fmt;
+    fmt=dxvaBitsToFormat(bits);
 
      hr = IDirectXVideoDecoderService_CreateSurface(decoder_service,
                                                    width,
                                                    height,
                                                    num - 1,
-                                                   (D3DFORMAT)MKTAG('N','V','1','2'), D3DPOOL_DEFAULT, 0,
+                                                   fmt, D3DPOOL_DEFAULT, 0,
                                                    DXVA2_VideoDecoderRenderTarget,
                                                    surfaces, NULL);
      if(ADM_FAILED(hr))
@@ -442,23 +467,29 @@
 /**
  *
  */
-bool        admDxva2::supported(AVCodecID codec)
+bool        admDxva2::supported(AVCodecID codec,int bits)
 {
-#define SUPSUP(a,b) if(codec==a) return (b.enabled) ;
-    SUPSUP(AV_CODEC_ID_H264,dxva2H264)
-    SUPSUP(AV_CODEC_ID_HEVC,dxva2H265)
+#define SUPSUP(a,b,c) if(codec==a && bits==c) return (b.enabled) ;
+    SUPSUP(AV_CODEC_ID_H264,dxva2H264,8)
+    SUPSUP(AV_CODEC_ID_HEVC,dxva2H265,8)
+    SUPSUP(AV_CODEC_ID_HEVC,dxva2H265_10Bits,10)
     return false;
 }
 /**
  * \fn getDecoderConfig
  */
-DXVA2_ConfigPictureDecode *admDxva2::getDecoderConfig(AVCodecID codec)
+DXVA2_ConfigPictureDecode *admDxva2::getDecoderConfig(AVCodecID codec,int bits)
 {
     Dxv2SupportMap *cmap;
     switch(codec)
     {
         case AV_CODEC_ID_H264: cmap=&dxva2H264;break;
-        case AV_CODEC_ID_H265: cmap=&dxva2H265;break;
+        case AV_CODEC_ID_H265:
+              if(10==bits)
+                cmap=&dxva2H265_10Bits;
+              else
+                cmap=&dxva2H265;
+              break;
         default:
             ADM_assert(0);
             break;
@@ -474,15 +505,29 @@
 /**
  * \fn createDecoder
  */
-IDirectXVideoDecoder  *admDxva2::createDecoder(AVCodecID codec, int with, int height, int numSurface, LPDIRECT3DSURFACE9 *surface,int align)
+IDirectXVideoDecoder  *admDxva2::createDecoder(AVCodecID codec, int with, int height, int numSurface, LPDIRECT3DSURFACE9 *surface,int align,int bits)
 {
     Dxv2SupportMap *cmap;
     int paddedWidth=ALIGN(with,align);
     int paddedHeight=ALIGN(height,align);
     switch(codec)
     {
-        case AV_CODEC_ID_H264: cmap=&dxva2H264;break;
-        case AV_CODEC_ID_H265: cmap=&dxva2H265;break;
+        case AV_CODEC_ID_H264:
+                ADM_info("Creating decoder DXVA2/H264/8 Bits\n");
+                cmap=&dxva2H264;
+                break;
+        case AV_CODEC_ID_H265:
+                if(bits==10)
+                {
+                    ADM_info("Creating decoder DXVA2/H264/10 Bits\n");
+                    cmap=&dxva2H265_10Bits;
+                }

avidemux_2.6.18.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/src/ADM_coreLibVA.cpp -> avidemux_2.6.19.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreLibVA/src/ADM_coreLibVA.cpp Changed

@@ -59,6 +59,7 @@
  void                   *context;
  VADisplay              display;
  VAConfigID             configH264;
+ VAConfigID             configMpeg2;
  VAConfigID             configH265;
  VAConfigID             configH26510Bits;
  VAConfigID             configVC1;
@@ -312,16 +313,16 @@
     if(!r)
         return false;
 
-
-    checkProfile(VAProfileH264High,     &ADM_coreLibVA::configH264,"H264 Hight");
-    checkProfile(VAProfileVC1Advanced,  &ADM_coreLibVA::configVC1 ,"VC1");
+    checkProfile(VAProfileMPEG2Main,    &ADM_coreLibVA::configMpeg2,    "Mpeg 2 Main");
+    checkProfile(VAProfileH264High,     &ADM_coreLibVA::configH264,     "H264 Hight");
+    checkProfile(VAProfileVC1Advanced,  &ADM_coreLibVA::configVC1 ,     "VC1");
 #ifdef LIBVA_HEVC_DEC
-    checkProfile(VAProfileHEVCMain,     &ADM_coreLibVA::configH265,"HEVC Main");
-    checkProfile(VAProfileHEVCMain10,   &ADM_coreLibVA::configH26510Bits ,"H265 10Bits");
+    checkProfile(VAProfileHEVCMain,     &ADM_coreLibVA::configH265,     "HEVC Main");
+    checkProfile(VAProfileHEVCMain10,   &ADM_coreLibVA::configH26510Bits,"H265 10Bits");
 #endif
 
 #ifdef LIBVA_VP9_DEC
-    checkProfile(VAProfileVP9Profile3,  &ADM_coreLibVA::configVP9 ,"VP9");
+    checkProfile(VAProfileVP9Profile3,  &ADM_coreLibVA::configVP9 ,     "VP9");
 #endif
     return true;
 }
@@ -344,8 +345,8 @@
 }
 
 /**
- * 
- * @return 
+ *
+ * @return
  */
 VADisplay admLibVA::getDisplay()
 {
@@ -406,11 +407,12 @@
     VAConfigID cid;
     switch(profile)
     {
-       case VAProfileH264High: cid=ADM_coreLibVA::configH264;break;
-       case VAProfileVC1Advanced: cid=ADM_coreLibVA::configVC1;break;
+       case VAProfileMPEG2Main:     cid=ADM_coreLibVA::configMpeg2;break;
+       case VAProfileH264High:      cid=ADM_coreLibVA::configH264;break;
+       case VAProfileVC1Advanced:   cid=ADM_coreLibVA::configVC1;break;
 #ifdef LIBVA_HEVC_DEC
-       case VAProfileHEVCMain: cid=ADM_coreLibVA::configH265;break;
-       case VAProfileHEVCMain10: cid=ADM_coreLibVA::configH26510Bits;break;
+       case VAProfileHEVCMain:      cid=ADM_coreLibVA::configH265;break;
+       case VAProfileHEVCMain10:    cid=ADM_coreLibVA::configH26510Bits;break;
 #endif
 
 #ifdef LIBVA_VP9_DEC
@@ -501,6 +503,7 @@
 #define SUPSUP(a,b) case a: if(ADM_coreLibVA::b!=-1) return true;break;
     switch(profile)
     {
+        SUPSUP(VAProfileMPEG2Main,configMpeg2)
         SUPSUP(VAProfileH264High,configH264)
         SUPSUP(VAProfileVC1Advanced,configVC1)
 #ifdef LIBVA_HEVC_DEC
@@ -538,6 +541,7 @@
 
     switch(profile)
     {
+       case VAProfileMPEG2Main:   cid=ADM_coreLibVA::configMpeg2;break;
        case VAProfileH264High:    cid=ADM_coreLibVA::configH264;break;
        case VAProfileVC1Advanced: cid=ADM_coreLibVA::configVC1;break;
 #ifdef LIBVA_HEVC_DEC
@@ -761,8 +765,9 @@
     //--------------------------
     // Wait for surface to be ready...
     //--------------------------
-    int countDown=20;
-    while(1)
+    int countDown=50;
+    bool end=false;
+    while(!end)
     {
      CHECK_ERROR(vaQuerySurfaceStatus ( ADM_coreLibVA::display, src->surface,&status));
      if(xError)
@@ -770,14 +775,34 @@
          ADM_warning("QuerySurfacStatus failed\n");
          return false;
      }
-     if(status==VASurfaceReady) break;
-     countDown--;
-     if(!countDown)
+     aprintf("surface status = %d\n",status);
+     switch(status)
      {
-         ADM_warning("Timeout waiting for surface\n");
-         return false;
-     }
-     ADM_usleep(1000);
+        case VASurfaceReady:
+                end=true;
+                continue;
+                break;
+        case VASurfaceSkipped:
+                end=true;
+                continue;
+                break;
+      default:
+          countDown--;
+          if(!countDown)
+          {
+              ADM_warning("Timeout waiting for surface\n");
+              end=true;
+              continue;
+          }
+          ADM_usleep(1000);
+          break;
+    }
+   }
+    if(status!=VASurfaceReady)
+    {
+      ADM_warning("Error getting surface within timeout = %d\n",(int)status);
+      dest->_noPicture=true;
+      return true;
     }
     //--------------------------
     // Derive Image
@@ -1124,7 +1149,7 @@
  * allocateWithSurface
  * @param w
  * @param h
- * @return 
+ * @return
  */
 ADM_vaSurface *ADM_vaSurface::allocateWithSurface(int w,int h)
 {
@@ -1205,16 +1230,16 @@
     return false;
 }
 /**
- * 
- * @return 
+ *
+ * @return
  */
 VAConfigID  admLibVA::createFilterConfig()
 {
       VAStatus xError;
       VAConfigID id=VA_INVALID;
-      
+
       if(!coreLibVAWorking) {ADM_warning("Libva not operationnal\n");return VA_INVALID;}
-      
+
       CHECK_ERROR(vaCreateConfig(ADM_coreLibVA::display, VAProfileNone, VAEntrypointVideoProc, 0, 0, &id));
       if(xError!=VA_STATUS_SUCCESS)
           return VA_INVALID;
@@ -1222,37 +1247,37 @@
 }
 
 /**
- * 
- * @return 
+ *
+ * @return
  */
 VAContextID admLibVA::createFilterContext()
 {
     return VA_INVALID;
 }
 /**
- * 
+ *
  * @param id
- * @return 
+ * @return
  */
 bool        admLibVA::destroyFilterContext(VAContextID &id)
 {
      VAStatus xError;
      if(!coreLibVAWorking) {ADM_warning("Libva not operationnal\n");return false;}
-    
+
     CHECK_ERROR( vaDestroyContext(ADM_coreLibVA::display, id));
     id=VA_INVALID;
     return true;
 }
 
 /**
- * 
- * @return 
+ *
+ * @return
  */
 bool        admLibVA::destroyFilterConfig(VAConfigID &id)
 {
     VAStatus xError;
      if(!coreLibVAWorking) {ADM_warning("Libva not operationnal\n");return false;}

avidemux_2.6.18.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/include/ADM_coreVdpau.h -> avidemux_2.6.19.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/include/ADM_coreVdpau.h Changed

avidemux_2.6.18.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/include/ADM_coreVdpauInternal.h -> avidemux_2.6.19.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/include/ADM_coreVdpauInternal.h Changed

avidemux_2.6.18.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/src/ADM_coreVdpau.cpp -> avidemux_2.6.19.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/src/ADM_coreVdpau.cpp Changed

avidemux_2.6.18.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/src/ADM_coreVdpauMixer.cpp -> avidemux_2.6.19.tar.gz/avidemux_core/ADM_coreVideoCodec/ADM_hwAccel/ADM_coreVdpau/src/ADM_coreVdpauMixer.cpp Changed

@@ -259,6 +259,30 @@
     return e;
 }
 
+bool admVdpau::queryDecoderCapabilities(
+                                                    VdpDecoderProfile profile,
+                                                    int *        maxWidth,
+                                                    int *        maxHeight)
+  {
+    VdpBool is_supported=false;
+    uint32_t max_level,max_macroblocks,max_width,max_height;
+    VdpStatus e=ADM_coreVdpau::funcs.queryDecoderCapabilities(ADM_coreVdpau::vdpDevice,
+                                                              profile,
+                                                              &is_supported,
+                                                              &max_level,
+                                                              &max_macroblocks,
+                                                              &max_width,
+                                                              &max_height);
+    if(VDP_STATUS_OK!=e)
+    {   
+        ADM_warning("queryDecoderCapabilities  failed :%s\n",getErrorString(e));   
+        return false;
+    }
+    *maxWidth=max_width;
+    *maxHeight=max_height;
+    return is_supported;
+  }
+
 /**
     \fn mixerRenderWithPastAndFuture
 */

avidemux_2.6.18.tar.gz/avidemux_core/ADM_coreVideoCodec/src/ADM_codecSearch.cpp -> avidemux_2.6.19.tar.gz/avidemux_core/ADM_coreVideoCodec/src/ADM_codecSearch.cpp Changed

avidemux_2.6.18.tar.gz/avidemux_core/ADM_coreVideoCodec/src/ADM_uyvy.cpp -> avidemux_2.6.19.tar.gz/avidemux_core/ADM_coreVideoCodec/src/ADM_uyvy.cpp Changed

avidemux_2.6.18.tar.gz/avidemux_core/corePackageDebian.cmake -> avidemux_2.6.19.tar.gz/avidemux_core/corePackageDebian.cmake Changed

avidemux_2.6.19.tar.gz/avidemux_core/ffmpeg_package/ffmpeg-3.0.7.tar.bz2 Added

avidemux_2.6.19.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_hevc_parser.c.patch Added

@@ -0,0 +1,99 @@
+--- libavcodec/hevc_parser.c.org	2017-01-30 07:50:12.779173809 +0100
++++ libavcodec/hevc_parser.c	2017-01-30 07:43:40.491714104 +0100
+@@ -25,6 +25,11 @@
+ #include "golomb.h"
+ #include "hevc.h"
+ #include "parser.h"
++/* MEANX */
++HEVCSPS *ff_hevc_parser_get_sps(AVCodecParserContext *s);
++HEVCPPS *ff_hevc_parser_get_pps(AVCodecParserContext *s);
++HEVCVPS *ff_hevc_parser_get_vps(AVCodecParserContext *s);
++/* /MEANX */
+ 
+ #define START_CODE 0x000001 ///< start_code_prefix_one_3bytes
+ 
+@@ -46,7 +51,7 @@
+ } HEVCParserContext;
+ 
+ #if !ADVANCED_PARSER
+-static int hevc_parse_slice_header(AVCodecParserContext *s, HEVCNAL *nal,
++int hevc_parse_slice_header(AVCodecParserContext *s, HEVCNAL *nal,
+                                    AVCodecContext *avctx)
+ {
+     HEVCParserContext *ctx = s->priv_data;
+@@ -81,7 +86,6 @@
+ 
+     return 0;
+ }
+-
+ static int parse_nal_units(AVCodecParserContext *s, const uint8_t *buf,
+                            int buf_size, AVCodecContext *avctx)
+ {
+@@ -128,7 +132,6 @@
+     return 0;
+ }
+ #endif
+-
+ /**
+  * Find the end of the current frame in the bitstream.
+  * @return the position of the first byte of the next frame, or END_NOT_FOUND
+@@ -174,6 +177,59 @@
+ 
+ #if ADVANCED_PARSER
+ /**
++ \fn ff_hevc_parser_get_sps
++\brief meanx : extract sps from context
++*/
++HEVCSPS *ff_hevc_parser_get_sps(AVCodecParserContext *s)
++{
++      int i;
++      HEVCParserContext *ctx = s->priv_data;
++      if(!ctx) return NULL;
++      HEVCContext       *h   = &ctx->h;
++      if(!h) return NULL;
++      HEVCParamSets     *ps = &h->ps;
++      if(!ps) return NULL;
++
++     HEVCSPS *sps = ps->sps;
++     return sps;
++}
++/**
++ \fn ff_hevc_parser_get_sps
++\brief meanx : extract sps from context
++*/
++HEVCPPS *ff_hevc_parser_get_pps(AVCodecParserContext *s)
++{
++      int i;
++      HEVCParserContext *ctx = s->priv_data;
++      if(!ctx) return NULL;
++      HEVCContext       *h   = &ctx->h;
++      if(!h) return NULL;
++      HEVCParamSets     *ps = &h->ps;
++      if(!ps) return NULL;
++
++     HEVCPPS *pps = ps->pps;
++     return pps;
++}
++/**
++ \fn ff_hevc_parser_get_sps
++\brief meanx : extract sps from context
++*/
++HEVCVPS *ff_hevc_parser_get_vps(AVCodecParserContext *s)
++{
++      int i;
++      HEVCParserContext *ctx = s->priv_data;
++      if(!ctx) return NULL;
++      HEVCContext       *h   = &ctx->h;
++      if(!h) return NULL;
++      HEVCParamSets     *ps = &h->ps;
++      if(!ps) return NULL;
++
++     HEVCVPS *vps = ps->vps;
++     return vps;
++}
++// /MEANX
++
++/**
+  * Parse NAL units of found picture and decode some basic information.
+  *
+  * @param s parser context.

avidemux_2.6.18.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_libavcodec.v.patch -> avidemux_2.6.19.tar.gz/avidemux_core/ffmpeg_package/patches/libavcodec_libavcodec.v.patch Changed

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_audioDecoders/ADM_ad_faad/ADM_ad_faad.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_audioDecoders/ADM_ad_faad/ADM_ad_faad.cpp Changed

@@ -95,18 +95,18 @@
     ADM_info("[FAAD] using %u bytes of extradata\n",l);
     if(l)
     {
-        for(int i=0;i<l;i++) ADM_info("%02x ",d[i]);
-        ADM_info("\n");
+        for(int i=0;i<l;i++) printf("%02x ",d[i]);
+        printf("\n");
     }
     // if we have some extra data, it means we can init it from it
     if(l)
     {
         
         faacDecInit2(_instance, d,l, &srate,&chan);
-        ADM_info("[FAAD]Found :%" PRIu32" rate %" PRIu32" channels\n",(uint32_t)srate,(uint32_t)chan);
+        ADM_info("[FAAD] Found :%" PRIu32" rate %" PRIu32" channels\n",(uint32_t)srate,(uint32_t)chan);
         if(srate!=info->frequency)
         {
-            ADM_info("[FAAD]Frequency mismatch!!! %d to %" PRIu32" (SBR ?)\n",info->frequency,(uint32_t)srate);
+            ADM_info("[FAAD] Frequency mismatch!!! %d to %" PRIu32" (SBR ?)\n",info->frequency,(uint32_t)srate);
             if(srate==2*info->frequency)
             {
                 ADM_info("Sbr detected\n");
@@ -117,7 +117,7 @@
         }
         if(chan!=info->channels) // Ask for stereo !
         {
-            ADM_info("[FAAD]channel mismatch!!! %d to %d \n",info->channels,chan);
+            ADM_info("[FAAD] Channel mismatch!!! %d to %d \n",info->channels,chan);
             if(info->channels==1 && chan==2) 
             {
                     ADM_warning("Workaround Faad mono stream handling... \n");
@@ -171,7 +171,7 @@
                 break;
         }
 
-		ADM_info("[FAAD]Faad decoder created\n");
+		ADM_info("[FAAD] Faad decoder created\n");
 }
 /**
     \fn dtor

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_audioDecoders/ADM_ad_lav/ADM_ad_lav.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_audioDecoders/ADM_ad_lav/ADM_ad_lav.cpp Changed

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_audioDecoders/ADM_ad_vorbis/ADM_ad_vorbis.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_audioDecoders/ADM_ad_vorbis/ADM_ad_vorbis.cpp Changed

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_audioDevices/PulseAudioSimple/ADM_devicePulseSimple.h -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_audioDevices/PulseAudioSimple/ADM_devicePulseSimple.h Changed

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_aac.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_aac.cpp Changed

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_ac3.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_ac3.cpp Changed

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_dts.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_dts.cpp Changed

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_mp2.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_audioEncoders/lavcodec/ADM_lav_mp2.cpp Changed

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp Changed

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_demuxers/Flv/ADM_flv.cpp Changed

@@ -365,7 +365,8 @@
 
 uint8_t flvHeader::open(const char *name)
 {
-  uint32_t prevLen, type, size, dts,pos=0;
+  uint32_t prevLen, type, size, dts;
+  uint64_t pos=0;
   bool firstVideo=true;
   _isvideopresent=0;
   _isaudiopresent=0;
@@ -380,11 +381,11 @@
     return 0;
   }
   // Get size
-  uint32_t fileSize=0;
+  uint64_t fileSize=0;
   fseeko(_fd,0,SEEK_END);
   fileSize=ftello(_fd);
   fseeko(_fd,0,SEEK_SET);
-  printf("[FLV] file size :%u bytes\n",fileSize);
+  printf("[FLV] file size :%" PRIu64 " bytes\n",fileSize);
   // It must begin by F L V 01
   uint8_t four[4];
 
@@ -417,7 +418,7 @@
   fseeko(_fd,skip,SEEK_SET);
   printf("[FLV] Skipping %u header bytes\n",skip);
   pos=ftello(_fd);;
-  printf("pos:%u/%u\n",pos,fileSize);
+  printf("pos:%" PRIu64 "/%" PRIu64 "\n",pos,fileSize);
   // Create our video index
   videoTrack=new flvTrak(50);
   if(_isaudiopresent)
@@ -435,7 +436,8 @@
     type=read8();
     size=read24();
     dts=read24();
-    read32(); // ???
+    dts|=((uint32_t)read8())<<24;
+    read24(); // StreamID, always 0
     aprintf("--------\n");
     aprintf("prevLen=%d\n",(int)prevLen);
     aprintf("type  =%d\n",(int)type);
@@ -443,7 +445,7 @@
     aprintf("dts   =%d\n",(int)dts);
     if(!size) continue;
     uint32_t remaining=size;
-    //printf("[FLV] At %08x found type %x size %u pts%u\n",pos,type,size,dts);
+    //printf("[FLV] At %08" PRIu64 " found type %x size %u pts%u\n",pos,type,size,dts);
     switch(type)
     {
       case FLV_TAG_TYPE_AUDIO:
@@ -512,7 +514,7 @@
                 insertVideo(ftello(_fd),remaining,frameType,dts,pts);
           }
            break;
-      default: printf("[FLV]At 0x%x, unhandled type %u\n",pos,type);
+      default: printf("[FLV]At 0x%" PRIx64 ", unhandled type %u\n",pos,type);
     }
     Skip(remaining);
   } // while
@@ -720,7 +722,7 @@
       \fn insertVideo
       \brief add a frame to the index, grow the index if needed
 */
-uint8_t flvHeader::insertVideo(uint32_t pos,uint32_t size,uint32_t frameType,uint32_t dts,uint32_t pts)
+uint8_t flvHeader::insertVideo(uint64_t pos,uint32_t size,uint32_t frameType,uint32_t dts,uint32_t pts)
 {
     videoTrack->grow();
     flvIndex *x=&(videoTrack->_index[videoTrack->_nbIndex]);
@@ -745,7 +747,7 @@
       \fn insertVideo
       \brief add a frame to the index, grow the index if needed
 */
-uint8_t flvHeader::insertAudio(uint32_t pos,uint32_t size,uint32_t pts)
+uint8_t flvHeader::insertAudio(uint64_t pos,uint32_t size,uint32_t pts)
 {
     audioTrack->grow();
     flvIndex *x=&(audioTrack->_index[audioTrack->_nbIndex]);

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_demuxers/Flv/ADM_flv.h -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_demuxers/Flv/ADM_flv.h Changed

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_demuxers/Flv/ADM_flvAudio.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_demuxers/Flv/ADM_flvAudio.cpp Changed

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv.cpp Changed

@@ -20,6 +20,7 @@
 #include "ADM_codecType.h"
 #include "mkv_tags.h"
 #include "ADM_audioXiphUtils.h"
+#include "ADM_vidMisc.h"
 
 /**
     \fn open
@@ -175,7 +176,7 @@
         }
         if(enforePtsGreaterThanDts)
         {
-                ADM_info("Have to delay by %" PRIu32" ms so that PTS>DTS\n",enforePtsGreaterThanDts);
+                ADM_info("Have to delay by %" PRIu64" us so that PTS>DTS\n",enforePtsGreaterThanDts);
                 for(int i=0;i<_nbAudioTrack+1;i++)
                 delayTrack(i,&(_tracks[i]),enforePtsGreaterThanDts);
         }
@@ -216,7 +217,6 @@
         _audioStreams[i]=ADM_audioCreateStream(&(_tracks[1+i].wavHeader), _access[i]);;
         _audioStreams[i]->setLanguage(_tracks[1+i].language);
     }
-  //dumpVideoIndex(200);
   printf("[MKV]Matroska successfully read\n");
   return 1;
 }
@@ -250,6 +250,10 @@
     int64_t delta,maxDelta=0;
     int64_t minDelta=100000000;
     *bFramePresent=false;
+    int nbValidDts=0;
+   
+    
+    
     if(nb>1)
     {
         bool monotone=true;
@@ -272,31 +276,38 @@
             ADM_info("PTS is not monotonous, there are bframe\n");
             *bFramePresent=true;
         }
-    }
-
-    if(nb>1)
-    {
         // Search minimum and maximum between 2 frames
         // the minimum will give us the maximum fps
         // the maximum will give us the max PTS-DTS delta so that we can compute DTS
         for(int i=0;i<nb-1;i++) 
         {
+            if(track->index[i].Dts!=ADM_NO_PTS)
+                nbValidDts++;
             if(track->index[i].flags==AVI_B_FRAME) nbBFrame++;
             if(track->index[i+1].Pts==ADM_NO_PTS || track->index[i].Pts==ADM_NO_PTS)
                 continue;
+            
             delta=(int64_t)track->index[i+1].Pts-(int64_t)track->index[i].Pts;
             if(delta<0) delta=-delta;
+            if(!delta)
+            {
+                ADM_warning("Duplicate PTS...(%d and %d,size=%d %d)\n",i,i+1,track->index[i].size,track->index[i+1].size);
+                continue;
+            }
             if(delta<minDelta) minDelta=delta;
             if(delta>maxDelta) maxDelta=delta;
             //printf("\/=%" PRId64" Min %" PRId64" MAX %" PRId64"\n",delta,minDelta,maxDelta);
         }
     }
     if(nbBFrame) *bFramePresent=true;
+       
+    
     ADM_info("Minimum delta found %" PRId64" us\n",minDelta);
     ADM_info("Maximum delta found %" PRId64" us\n",maxDelta);
+    ADM_info("Default duration    %" PRId64" us\n",track->_defaultFrameDuration);
     if(minDelta)
     {
-        if(minDelta<track->_defaultFrameDuration && labs((long int)minDelta-(long int)track->_defaultFrameDuration)>1000)
+        if(minDelta<track->_defaultFrameDuration && labs((long int)minDelta-(long int)track->_defaultFrameDuration)>100)
         {
             ADM_info("Changing default frame duration from %" PRIu64" to %" PRIu64" us\n",
                     track->_defaultFrameDuration,minDelta);
@@ -313,6 +324,16 @@
 
     }
     ADM_info("First frame pts     %" PRId64" us\n",track->index[0].Pts);
+    
+    if(nbValidDts<3)
+    {
+            ADM_warning("Not enough valid DTS\n");
+            *minDeltaX=minDelta;
+            *maxDeltaX=0;
+            return false;
+    }
+    
+    
     uint64_t adj=0;
     int limit=32;
     if(limit>nb) limit=nb;

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvEntries.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvEntries.cpp Changed

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Analyzer.cpp Changed

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4Indexer.cpp Changed

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsAudio.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsAudio.cpp Changed

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsBruteForce.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsBruteForce.cpp Changed

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndex.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndex.cpp Changed

@@ -80,23 +80,35 @@
     delete p;
     printf("[TsIndexer] Audio probed, %d found, doing video\n",(int)audioTrack.size());
     //
-    TsIndexer *dx=new TsIndexer(&audioTrack);
+    TsIndexerBase *dx=NULL;
     switch(tracks[0].trackType)
     {
             case ADM_TS_MPEG2: 
-                            r=dx->runMpeg2(file,&(tracks[0]));
+                            dx=new TsIndexerMpeg2(&audioTrack);
                             break;
             case ADM_TS_VC1: 
-                            r=dx->runVC1(file,&(tracks[0]));
+                            dx=new TsIndexerVC1(&audioTrack);
+                            break;
+            case ADM_TS_H265: 
+                            dx=new TsIndexerH265(&audioTrack);
                             break;
             case ADM_TS_H264: 
-                            r=dx->runH264(file,&(tracks[0]));
+                            dx=new TsIndexerH264(&audioTrack);
                             break;
             default:
                         r=0;
                         break;
     }
-    delete dx;
+    if(!dx)
+    {
+        ADM_warning("Unsupported video codec \n");
+        r=false;
+    }else
+    {
+        r=dx->run( file,&(tracks[0]));
+        delete dx;
+        dx=NULL;
+    }
     delete [] tracks;
     return r;
 }
@@ -104,9 +116,9 @@
 /**
     \fn TsIndexer
 */
-TsIndexer::TsIndexer(listOfTsAudioTracks *trk)
+TsIndexerBase::TsIndexerBase(listOfTsAudioTracks *trk)
 {
-    memset(&spsInfo,0,sizeof(spsInfo));
+
     index=NULL;
     pkt=NULL;
     audioTracks=NULL;
@@ -119,7 +131,7 @@
 /**
     \fn ~TsIndexer
 */
-TsIndexer::~TsIndexer()
+TsIndexerBase::~TsIndexerBase()
 {
     if(index) qfclose(index);
     if(pkt) delete pkt;
@@ -130,7 +142,7 @@
     \fn updateUI
  *  \brief return false if abort is needed
 */
-bool  TsIndexer::updateUI(void)
+bool  TsIndexerBase::updateUI(void)
 {
     int p=++processedThisRound;
         processedThisRound=0;
@@ -141,7 +153,7 @@
     \fn writeVideo
     \brief Write Video section of index file
 */
-bool TsIndexer::writeVideo(TSVideo *video,ADM_TS_TRACK_TYPE trkType)
+bool TsIndexerBase::writeVideo(TSVideo *video,ADM_TS_TRACK_TYPE trkType)
 {
     qfprintf(index,"[Video]\n");
     qfprintf(index,"Width=%d\n",video->w);
@@ -161,6 +173,7 @@
     {
         case ADM_TS_MPEG2: qfprintf(index,"VideoCodec=Mpeg2\n");break;;
         case ADM_TS_H264:  qfprintf(index,"VideoCodec=H264\n");break;
+        case ADM_TS_H265:  qfprintf(index,"VideoCodec=H265\n");break;
         case ADM_TS_VC1:   qfprintf(index,"VideoCodec=VC1\n");break;
         default: printf("[TsIndexer] Unsupported video codec\n");return false;
 
@@ -171,7 +184,7 @@
     \fn writeSystem
     \brief Write system part of index file
 */
-bool TsIndexer::writeSystem(const char *filename,bool append)
+bool TsIndexerBase::writeSystem(const char *filename,bool append)
 {
     qfprintf(index,"PSD1\n");
     qfprintf(index,"[System]\n");
@@ -185,7 +198,7 @@
     \fn     writeAudio
     \brief  Write audio headers
 */
-bool TsIndexer::writeAudio(void)
+bool TsIndexerBase::writeAudio(void)
 {
     if(!audioTracks) return false;
     qfprintf(index,"[Audio]\n");
@@ -218,7 +231,7 @@
 /**
     \fn dumpUnits
 */
-bool TsIndexer::dumpUnits(indexerData &data,uint64_t nextConsumed,const dmxPacketInfo *nextPacket)
+bool TsIndexerBase::dumpUnits(indexerData &data,uint64_t nextConsumed,const dmxPacketInfo *nextPacket)
 {
         // if it contain a SPS or a intra/idr, we start a new line
         bool mustFlush=false;
@@ -284,6 +297,9 @@
 
         qfprintf(index," %c%c",Type[picUnit->imageType],Structure[pictStruct&3]);
         int32_t delta=(int32_t)(nextConsumed-beginConsuming);
+        
+    //    printf("%d -- %d = %d\n",nextConsumed, beginConsuming,delta);
+        
         qfprintf(index,":%06" PRIx32,delta);
         qfprintf(index,":%" PRId64":%" PRId64,deltaPts,deltaDts);
     
@@ -294,7 +310,7 @@
 /**
     \fn addUnit
 */
-bool TsIndexer::addUnit(indexerData &data,int unitType2,const H264Unit &unit,uint32_t overRead)
+bool TsIndexerBase::addUnit(indexerData &data,int unitType2,const H264Unit &unit,uint32_t overRead)
 {
         H264Unit myUnit=unit;
         myUnit.unitType=unitType2;

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndex.h -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndex.h Changed

@@ -119,6 +119,167 @@
 /**
     \class TsIndexer
 */
+class TsIndexerBase
+{
+protected:
+        uint32_t        beginConsuming;
+        uint64_t        fullSize;
+        vector <H264Unit> listOfUnits;
+        H264Unit        thisUnit;
+        bool            decodingImage;
+        int             processedThisRound;
+        
+protected:
+        FILE                    *index;
+        tsPacketLinearTracker   *pkt;
+        listOfTsAudioTracks     *audioTracks;
+        DIA_processingBase      *gui;        
+        bool                    updateUI(void);
+        // H264
+        bool                    addUnit(indexerData &data,int unitType,const H264Unit &unit,uint32_t overRead);
+        bool                    dumpUnits(indexerData &data,uint64_t nextConsumed,const dmxPacketInfo *nextPacket);
+public:
+                TsIndexerBase(listOfTsAudioTracks *tr);
+        virtual ~TsIndexerBase();
+virtual bool    run(const char *file,ADM_TS_TRACK *videoTrac)=0;                
+        bool    writeVideo(TSVideo *video,ADM_TS_TRACK_TYPE trkType);
+        bool    writeAudio(void);
+        bool    writeSystem(const char *filename,bool append);
+        bool    updatePicStructure(TSVideo &video,const uint32_t t)
+                        {
+                                            switch(t)
+                                            {
+                                                case 3: video.frameCount++;
+                                                        thisUnit.imageStructure=pictureFrame;
+                                                        break;
+                                                case 1:  thisUnit.imageStructure=pictureTopField;
+                                                         video.fieldCount++;
+                                                         break;
+                                                case 2:  thisUnit.imageStructure=pictureBottomField;
+                                                         video.fieldCount++;
+                                                         break;
+                                                default: ADM_warning("frame type 0 met, this is illegal\n");
+                                            }
+                                            return true;
+                        }
+};
+
+/**
+    \class TsIndexerH264
+*/
+class TsIndexerH264 : public TsIndexerBase
+{
+protected:
+        bool            findH264SPS(tsPacketLinearTracker *pkt,TSVideo &video);
+        
+protected:
+        ADM_SPSInfo             spsInfo;
+        bool                    decodeSEI(uint32_t nalSize, uint8_t *org,uint32_t *recoveryLength,pictureStructure *nextpicstruct);
+        #define                 ADM_NAL_BUFFER_SIZE (2*1024) // only used to decode SEI, should plenty enough
+        uint8_t                 payloadBuffer[ADM_NAL_BUFFER_SIZE];
+public:
+                TsIndexerH264(listOfTsAudioTracks *tr) : TsIndexerBase(tr)
+                {
+                      memset(&spsInfo,0,sizeof(spsInfo));
+                }
+                ~TsIndexerH264()
+                {
+                  
+                } 
+        bool    run(const char *file,ADM_TS_TRACK *videoTrac);
+        bool    updatePicStructure(TSVideo &video,const uint32_t t)
+                        {
+                                            switch(t)
+                                            {
+                                                case 3: video.frameCount++;
+                                                        thisUnit.imageStructure=pictureFrame;
+                                                        break;
+                                                case 1:  thisUnit.imageStructure=pictureTopField;
+                                                         video.fieldCount++;
+                                                         break;
+                                                case 2:  thisUnit.imageStructure=pictureBottomField;
+                                                         video.fieldCount++;
+                                                         break;
+                                                default: ADM_warning("frame type 0 met, this is illegal\n");
+                                            }
+                                            return true;
+                        }
+};
+
+class TsIndexerVC1: public TsIndexerBase
+{
+protected:
+        VC1Context      vc1Context;
+        
+protected:
+        bool            decodeVC1Seq(tsGetBits &bits,TSVideo &video);
+        bool            decodeVC1Pic(tsGetBits &bits,uint32_t &frameType,uint32_t &frameStructure);
+public:
+                        ~TsIndexerVC1()
+                        {
+                          
+                        }
+        bool            run(const char *file,ADM_TS_TRACK *videoTrac);
+                        TsIndexerVC1(listOfTsAudioTracks *tr) : TsIndexerBase(tr)
+                        {
+
+                        }
+};
+//--
+/**
+*
+    \class TsIndexerH264
+*/
+class TsIndexerMpeg2 : public TsIndexerBase
+{
+protected:
+
+public:
+                ~TsIndexerMpeg2()
+                {
+                  
+                }
+        bool    run(const char *file,ADM_TS_TRACK *videoTrac);
+                TsIndexerMpeg2(listOfTsAudioTracks *tr) : TsIndexerBase(tr)
+                {
+
+                }
+       
+};
+//--
+/**
+*
+    \class TsIndexerH264
+*/
+class TsIndexerH265 : public TsIndexerBase
+{
+protected:
+        ADM_SPSinfoH265 info;
+        
+        bool            findH265VPS(tsPacketLinearTracker *pkt,TSVideo &video);
+        bool            decodeH265SPS(tsPacketLinearTracker *pkt);
+        int             decodePictureTypeH265(int nalType,getBits &bits) ;     
+        bool            decodeSEIH265(uint32_t nalSize, uint8_t *org,uint32_t *recoveryLength,   pictureStructure *picStruct);
+        
+protected:
+public:
+                ~TsIndexerH265()
+                {
+                  
+                }
+        bool    run(const char *file,ADM_TS_TRACK *videoTrac);
+                TsIndexerH265(listOfTsAudioTracks *tr) : TsIndexerBase(tr)
+                {
+
+                }
+        
+};
+//---
+#if 0
+/**
+*
+    \class TsIndexerH264
+*/
 class TsIndexer
 {
 protected:
@@ -129,6 +290,13 @@
         H264Unit        thisUnit;
         bool            decodingImage;
         int             processedThisRound;
+        ADM_SPSinfoH265 info;
+        
+        bool            findH264SPS(tsPacketLinearTracker *pkt,TSVideo &video);
+        bool            findH265VPS(tsPacketLinearTracker *pkt,TSVideo &video);
+        bool            decodeH265SPS(tsPacketLinearTracker *pkt);
+        int             decodePictureTypeH265(int nalType,getBits &bits) ;       
+        
 protected:
         FILE                    *index;
         tsPacketLinearTracker   *pkt;
@@ -137,6 +305,7 @@
         ADM_SPSInfo             spsInfo;
         bool                    updateUI(void);
         bool                    decodeSEI(uint32_t nalSize, uint8_t *org,uint32_t *recoveryLength,pictureStructure *nextpicstruct);
+        bool                    decodeSEIH265(uint32_t nalSize, uint8_t *org,uint32_t *recoveryLength,pictureStructure *nextpicstruct);
         bool                    decodeVC1Seq(tsGetBits &bits,TSVideo &video);
         bool                    decodeVC1Pic(tsGetBits &bits,uint32_t &frameType,uint32_t &frameStructure);
         // H264
@@ -149,6 +318,7 @@
                 ~TsIndexer();
         bool    runMpeg2(const char *file,ADM_TS_TRACK *videoTrac);
         bool    runH264(const char *file,ADM_TS_TRACK *videoTrac);
+        bool    runH265(const char *file,ADM_TS_TRACK *videoTrac);
         bool    runVC1(const char *file,ADM_TS_TRACK *videoTrac);
         bool    writeVideo(TSVideo *video,ADM_TS_TRACK_TYPE trkType);
         bool    writeAudio(void);
@@ -171,6 +341,7 @@
                                             return true;

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH264.cpp Changed

@@ -23,7 +23,7 @@
         @param recoveryLength # of recovery frame
         \return true if recovery found
 */
-bool TsIndexer::decodeSEI(uint32_t nalSize, uint8_t *org,uint32_t *recoveryLength,
+bool TsIndexerH264::decodeSEI(uint32_t nalSize, uint8_t *org,uint32_t *recoveryLength,
                 pictureStructure *picStruct)
 {
     if(nalSize+16>=ADM_NAL_BUFFER_SIZE)
@@ -73,21 +73,81 @@
     //if(payload+1<tail) ADM_warning("Bytes left in SEI %d\n",(int)(tail-payload));
     return r;
 }
+/**
+ * \fn findH264SPS
+ * @return 
+ */
+bool TsIndexerH264::findH264SPS(tsPacketLinearTracker *pkt,TSVideo &video)
+{
+    dmxPacketInfo tmpInfo;
+    bool keepRunning=true;
+    bool seq_found=false;
+    TS_PESpacket SEI_nal(0);
+    while(keepRunning)
+    {
+      int startCode=pkt->findStartCode();
 
+      if(!pkt->stillOk())
+      {
+          keepRunning=false;
+          continue;
+      }
+      if(startCode&0x80) continue; // Marker missing
+      startCode&=0x1f;
+      if(startCode!=NAL_SPS) 
+          continue;
+
+        // Got SPS!
+
+        uint32_t xA,xR;
+        // Get info
+        pkt->getInfo(&tmpInfo);
+        // Read just enough...
+        {
+          SEI_nal.empty();
+          uint32_t code=0xffff+0xffff0000;
+          while(((code&0xffffff)!=1) && pkt->stillOk())
+          {
+                  uint8_t r=pkt->readi8();
+                  code=(code<<8)+r;
+                  SEI_nal.pushByte(r);
+          }
+          if(!pkt->stillOk()) break;;
+          pkt->seek(tmpInfo.startAt,tmpInfo.offset-5);
+          if (extractSPSInfo(SEI_nal.payload, SEI_nal.payloadSize-4,&spsInfo))
+          {
+            ADM_info("[TsIndexer] Found video %" PRIu32"x%" PRIu32", fps=%" PRIu32"\n",video.w,video.h,video.fps);
+            ADM_info("[TsIndexer] SPS says %" PRIu32"x%" PRIu32"\n",spsInfo.width,spsInfo.height);
+            seq_found=1;
+            video.w=spsInfo.width;
+            video.h=spsInfo.height;
+            video.fps=spsInfo.fps1000;
+            xA=spsInfo.darNum;
+            xR=spsInfo.darDen;
+            writeVideo(&video,ADM_TS_H264);
+            writeAudio();
+            qfprintf(index,"[Data]");
+            // Rewind
+
+            break;
+        };
+      }
+    }
+    return seq_found;
+}
 /**
     \fn runH264
     \brief Index H264 stream
 */
-bool TsIndexer::runH264(const char *file,ADM_TS_TRACK *videoTrac)
+bool TsIndexerH264::run(const char *file,ADM_TS_TRACK *videoTrac)
 {
 
 bool    seq_found=false;
 bool    firstSps=true;
-
+TS_PESpacket SEI_nal(0);
 TSVideo video;
 indexerData  data;
-dmxPacketInfo tmpInfo;
-TS_PESpacket SEI_nal(0);
+
 bool result=false;
 bool bAppend=false;
 
@@ -96,7 +156,8 @@
 
     printf("Starting H264 indexer\n");
     if(!videoTrac) return false;
-    if(videoTrac[0].trackType!=ADM_TS_H264)
+    if(videoTrac[0].trackType!=ADM_TS_H264 
+       )
     {
         printf("[Ts Indexer] Only H264 video supported\n");
         return false;
@@ -136,58 +197,15 @@
     //******************
     // 1 search SPS
     //******************
-      while(keepRunning)
-      {
-        int startCode=pkt->findStartCode();
-
-        if(!pkt->stillOk())
-        {
-            keepRunning=false;
-            continue;
-        }
-        if(startCode&0x80) continue; // Marker missing
-        startCode&=0x1f;
-        if(startCode!=NAL_SPS) 
-            continue;
-
-          // Got SPS!
-
-          uint32_t xA,xR;
-          // Get info
-          pkt->getInfo(&tmpInfo);
-          // Read just enough...
-          {
-            SEI_nal.empty();
-            uint32_t code=0xffff+0xffff0000;
-            while(((code&0xffffff)!=1) && pkt->stillOk())
-            {
-                    uint8_t r=pkt->readi8();
-                    code=(code<<8)+r;
-                    SEI_nal.pushByte(r);
-            }
-            if(!pkt->stillOk()) break;;
-            pkt->seek(tmpInfo.startAt,tmpInfo.offset-5);
-            if (extractSPSInfo(SEI_nal.payload, SEI_nal.payloadSize-4,&spsInfo))
-            {
-              ADM_info("[TsIndexer] Found video %" PRIu32"x%" PRIu32", fps=%" PRIu32"\n",video.w,video.h,video.fps);
-              ADM_info("[TsIndexer] SPS says %" PRIu32"x%" PRIu32"\n",spsInfo.width,spsInfo.height);
-              seq_found=1;
-              video.w=spsInfo.width;
-              video.h=spsInfo.height;
-              video.fps=spsInfo.fps1000;
-              xA=spsInfo.darNum;
-              xR=spsInfo.darDen;
-              writeVideo(&video,ADM_TS_H264);
-              writeAudio();
-              qfprintf(index,"[Data]");
-              // Rewind
-
-              break;
-          };
-        }
-      }
-
-        if(!seq_found) goto the_end;
+    switch(videoTrac[0].trackType)
+    {
+        case ADM_TS_H264 :
+            seq_found=findH264SPS(pkt,video);
+            break;
+        default:
+            break;
+    }    
+    if(!seq_found) goto the_end;
 
         decodingImage=false;
     //******************

avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexH265.cpp Added

@@ -0,0 +1,463 @@
+/***************************************************************************
+    \brief TS indexer, H265 video
+    \author mean fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#include "ADM_tsIndex.h"
+#include "DIA_coreToolkit.h"
+#include "ADM_tsIndex.h"
+#include "ADM_h265_tag.h"
+#include "ADM_vidMisc.h"
+/**
+ * 
+ * @param sc
+ * @return 
+ */    
+static const char *startCodeToString(int sc)
+{
+    int n= sizeof(nalDesc)/sizeof(NAL_DESC);
+    for(int i=0;i<n;i++)
+    {
+        if(nalDesc[i].value==sc)
+            return nalDesc[i].name;
+    }
+    return "????";
+}
+
+/**
+        \fn decodeSEI
+        \brief decode SEI to get short ref I
+        @param recoveryLength # of recovery frame
+        \return true if recovery found
+*/
+bool TsIndexerH265::decodeSEIH265(uint32_t nalSize, uint8_t *org,uint32_t *recoveryLength,
+                pictureStructure *picStruct)
+{
+#if 0
+    if(nalSize+16>=ADM_NAL_BUFFER_SIZE)
+    {
+        ADM_warning("SEI size too big, probably corrupted input (%u bytes)\n",nalSize);
+        return false;
+    }
+    uint8_t *payload=payloadBuffer;
+    bool r=false;
+    nalSize=ADM_unescapeH264(nalSize,org,payload);
+    uint8_t *tail=payload+nalSize;
+    *picStruct=pictureFrame; // frame
+    while( payload<tail-2)
+    {
+                uint32_t sei_type=0,sei_size=0;
+                while(payload[0]==0xff) {sei_type+=0xff;payload++;};
+                sei_type+=payload[0];payload++;
+                while(payload[0]==0xff) {sei_size+=0xff;payload++;};
+                sei_size+=payload[0];payload++;
+                aprintf("  [SEI] Type: 0x%x, size: %u\n",sei_type,sei_size);
+                if(payload+sei_size>=tail)
+                {
+                        return false;
+                }
+                switch(sei_type) // Recovery point
+                {
+
+                       case 1:
+                        {
+                            decoderSei1(spsInfo,sei_size,payload,picStruct);
+                            payload+=sei_size;
+                            break;
+                        }
+                       case 6:
+                        {
+                            decoderSei6(sei_size,payload,recoveryLength);
+                            payload+=sei_size;
+                            aprintf("[SEI] Recovery :%" PRIu32"\n",*recoveryLength);
+                            r=true;
+                            break;
+                        }
+                        default:
+                            payload+=sei_size;
+                            break;
+                }
+    }
+    //if(payload+1<tail) ADM_warning("Bytes left in SEI %d\n",(int)(tail-payload));
+    return r;
+#endif
+   return false;
+}
+
+/**
+ * \fn findGivenStartCode
+ * @param pkt
+ * @param match
+ * @return 
+ */
+static bool findGivenStartCode(tsPacketLinearTracker *pkt,int match, const char *name)
+{
+    bool keepRunning=true;    
+    while(keepRunning)
+    {
+      int startCode=pkt->findStartCode();
+      if(!pkt->stillOk())
+      {
+          return false;
+      }     
+      printf("Match %x %d\n",startCode,((startCode>>1)&0x3f));
+      startCode=((startCode>>1)&0x3f);  
+      
+      if(startCode!=match && match) 
+          continue;
+        dmxPacketInfo packetInfo;
+        pkt->getInfo( &packetInfo);
+      
+      ADM_info("%s found at 0x%x+0x%x\n",name,(int)packetInfo.startAt,packetInfo.offset);
+      return true;
+    }
+    return false;
+}
+
+/**
+ * \fn findGivenStartCode
+ * @param pkt
+ * @param match: Startcode to find, zero means any startcode
+ * @return 
+ */
+static uint8_t * findGivenStartCodeInBuffer(uint8_t *start, uint8_t *end,int match, const char *name)
+{
+    
+    while(start+4<end)
+    {
+        if(!start[0]&&!start[1] && start[2]==0x01)
+        {
+            uint8_t code=(start[3]>>1)&0x3f;
+            printf(" Matcho = %d\n",code);
+            if(code==match || !match) return start;
+        }
+        start++;
+    }
+    ADM_warning("Cannot find %s\n",name);
+    return NULL;
+}
+
+/**
+ * \fn findH264SPS
+ * @return 
+ */
+bool TsIndexerH265::findH265VPS(tsPacketLinearTracker *pkt,TSVideo &video)
+{    
+    bool keepRunning=true;
+    dmxPacketInfo packetInfo;
+    uint8_t headerBuffer[512]={0,0,0,1,(NAL_H265_VPS<<1)}; // we are forcing some bits to be zero...
+    // This is a bit naive...
+        
+    if(!findGivenStartCode(pkt,NAL_H265_VPS ,"VPS"))
+    {
+        ADM_warning("Cannot find HEVC VPS\n");
+        return false;
+    }   
+    
+    pkt->getInfo( &packetInfo);
+    thisUnit.consumedSoFar=0; // Head
+    
+    uint64_t startExtraData=packetInfo.startAt-193; // /!\ It may be in the previous packet, very unlikely though    
+    pkt->read(512,headerBuffer+5);
+    uint8_t *pointer=headerBuffer+5;
+    uint8_t *end=headerBuffer+512;
+    // Rewind
+    pkt->setPos(packetInfo.startAt);
+    
+    pointer=findGivenStartCodeInBuffer(pointer,end,NAL_H265_SPS,"SPS");
+    if(!pointer)
+    {
+        ADM_warning("Cannot find HEVC SPS\n");
+        return false;
+    }
+    ADM_info("SPS found at %d\n",(int)(pointer-headerBuffer));
+    pointer=findGivenStartCodeInBuffer(pointer,end,NAL_H265_PPS,"PPS");
+    if(!pointer)
+    {
+        ADM_warning("Cannot find HEVC PPS\n");
+        return false;
+    }
+    ADM_info("PPS found at %d\n",(int)(pointer-headerBuffer));
+    pointer=findGivenStartCodeInBuffer(pointer+3,end,0,"Any");
+    if(!pointer)
+    {
+        ADM_warning("Cannot find HEVC next marker\n");
+        return false;
+    }
+    ADM_info("Any found at %d\n",(int)(pointer-headerBuffer));
+    int extraLen=(int)(pointer-headerBuffer); // should be enough (tm)    
+    
+    ADM_info("VPS/SPS/PPS lengths = %d bytes \n",extraLen);
+

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexMpeg2.cpp Changed

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsIndexVC1.cpp Changed

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsPatPmt.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsPatPmt.cpp Changed

@@ -20,6 +20,7 @@
 #include "ADM_ts.h"
 #include "ADM_demuxerInternal.h"
 #include "ADM_tsPatPmt.h"
+#include "fourcc.h"
 
 typedef vector <ADM_TS_TRACK> listOfTsTracks;
 
@@ -48,6 +49,7 @@
     {0x004,ADM_TS_MPEG_AUDIO,"Mpeg2 Audio"},
     {0x005,ADM_TS_UNKNOWN,   "Registration"},
     {0x01b,ADM_TS_H264,      "H264 Video"},
+    {0x00f,ADM_TS_H264,      "H265 Video"},
     {0x081,ADM_TS_AC3,       "AC3 Audio"},
     {0x0ea,ADM_TS_VC1,       "VC1 Video"},
     {0x006,ADM_TS_UNKNOWN,   "Private Stream"},
@@ -129,7 +131,7 @@
     for(int i=0;i<list.size();i++)
     {
         ADM_TS_TRACK_TYPE type=list[i].trackType;
-        if(type==ADM_TS_MPEG2 || type==ADM_TS_H264 || type==ADM_TS_VC1)
+        if(type==ADM_TS_MPEG2 || type==ADM_TS_H264 || type==ADM_TS_VC1 || type==ADM_TS_H265)
         {
             videoIndex=i;
             break;
@@ -255,6 +257,13 @@
                printf("\n");
                switch(tag)
                {
+               case 0x05: // registration descriptor
+                   if(fourCC::check(head+2,(uint8_t *)"HEVC"))
+                   {
+                       printf("[PMT} HEVC tag found\n");
+                       type=0x24;
+                   }
+                   break;
                case 0xa:  // dvb language
                {
                    if(tag_len<2) break; // too short
@@ -314,6 +323,7 @@
                 case 0xF:      *str= "Mpeg AAC ADTS";return ADM_TS_AAC_ADTS;break;
                 case 0x11:     *str= "Mpeg AAC LATM";return ADM_TS_AAC_LATM;break;
                 case 0x1B:     *str= "H264 Video";return ADM_TS_H264;break;
+                case 0x24:     *str= "H265 Video(not sure)";return ADM_TS_H265;break;
                 case 0x81:     *str= "AC3 (Not sure)";return ADM_TS_AC3;break;
                 //case 0x82:     *str= "DTS (Not sure)";return ADM_TS_DTS;break;
                 case 0x83:     *str= "TrueHD AC3  (BluRay)";return ADM_TS_AC3;break;

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsPatPmt.h -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsPatPmt.h Changed

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsReadIndex.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/ADM_tsReadIndex.cpp Changed

@@ -133,11 +133,16 @@
                 if(*(cur)!=':')
                 {
                     printf("[TsDemuxer]  instead of : (%c %x %x):\n",*cur,*(cur-1),*cur);
+                    return false;
                 }
                 cur++;
                 next=strstr(start," ");
                 int64_t ppts,ddts;
-                ADM_assert(3==sscanf(cur,"%" PRIx32":%" PRId64":%" PRId64,&len,&ppts,&ddts));
+                if(3!=sscanf(cur,"%" PRIx32":%" PRId64":%" PRId64,&len,&ppts,&ddts))
+                {
+                        ADM_warning("Malformed line (%s)\n",buffer);
+                        return false;
+                }
                 
                 
                 dmxFrame *frame=new dmxFrame;
@@ -197,6 +202,7 @@
         \brief Read the [video] section of the index file
 
 */
+
 bool    tsHeader::readVideo(indexFile *index)
 {
     printf("[TsDemuxerer] Reading Video\n");
@@ -210,9 +216,9 @@
     if(type)
     {
         printf("[TsIndex] codec :<%s>\n",type);
-        if(!strcmp(type,"H264"))
+        if(!strcmp(type,"H264") || !strcmp(type,"H265"))
         {
-             _videostream.fccHandler=_video_bih.biCompression=fourCC::get((uint8_t *)"H264");
+             _videostream.fccHandler=_video_bih.biCompression=fourCC::get((uint8_t *)type);
         }else
         if(!strcmp(type,"VC1"))
         {

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/CMakeLists.txt -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/CMakeLists.txt Changed

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/dmxTSPacket.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/dmxTSPacket.cpp Changed

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/dmxTSPacket.h -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_demuxers/MpegTS/dmxTSPacket.h Changed

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_demuxers/OpenDml/ADM_openDML.cpp Changed

@@ -682,8 +682,8 @@
                                 }
                                 else
                                 {
-                                        printf("Track %u/%u :\n",i,_nbTrack);
-                                        fourCC::print(tmp.fccType);
+                                        printf("Track %u/%u : ",i,_nbTrack);
+                                        fourCC::print(tmp.fccType);printf(", ");
                                         fourCC::print(tmp.fccHandler);
                                         printf("\n");
                                 }
@@ -722,11 +722,10 @@
 				
 	printf(  "[Avi] video stream attached:\n" );
 	printf(  "[Avi] ______________________\n" );	
-	printf(  "[Avi] Extra Data  : %u",_videoExtraLen);
+	printf(  "[Avi] Extra Data  : %u\n",_videoExtraLen);
 	if(_videoExtraLen)
 	{
 		mixDump( _videoExtraData, _videoExtraLen);
-        printf("\n");
 	}
 
 	printf("[Avi]  fccType     :");
@@ -799,7 +798,6 @@
 	{
 		mixDump( _audioTracks[i].extraData, _audioTracks[i].extraDataLen);
 	}
-	printf("\n");
 
       }
 }

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Video.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Video.cpp Changed

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.cpp Changed

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.h -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/ADM_pyAvidemux.h Changed

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/CMakeLists.txt -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/CMakeLists.txt Changed

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/binding/editor.admPyClass -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/binding/editor.admPyClass Changed

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/editor_gen.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_scriptEngines/tinyPy/src/editor_gen.cpp Changed

@@ -1,6 +1,6 @@
 // Generated by admPyClass.pl do not edit !
-// printTiming -> int pyPrintTiming (IEditor int ) 
-static tp_obj zzpy_printTiming(TP)
+// getFrameSize -> int editor->getFrameSize (int ) 
+static tp_obj zzpy_getFrameSize(TP)
  {
   tp_obj self = tp_getraw(tp);
   IScriptEngine *engine = (IScriptEngine*)tp_get(tp, tp->builtins, tp_string("userdata")).data.val;
@@ -8,9 +8,20 @@
   TinyParams pm(tp);
   void *me = (void *)pm.asThis(&self, ADM_PYID_EDITOR);
 
-  IEditor *p0 = editor;
-  int p1 = pm.asInt();
-  int r =   pyPrintTiming(p0,p1); 
+  int p0 = pm.asInt();
+  int r =   editor->getFrameSize(p0); 
+  return tp_number(r);
+}
+// nbSegments -> int editor->getNbSegment (void ) 
+static tp_obj zzpy_nbSegments(TP)
+ {
+  tp_obj self = tp_getraw(tp);
+  IScriptEngine *engine = (IScriptEngine*)tp_get(tp, tp->builtins, tp_string("userdata")).data.val;
+  IEditor *editor = engine->editor();
+  TinyParams pm(tp);
+  void *me = (void *)pm.asThis(&self, ADM_PYID_EDITOR);
+
+  int r =   editor->getNbSegment(); 
   return tp_number(r);
 }
 // hexDumpFrame -> int pyHexDumpFrame (IEditor int ) 
@@ -27,8 +38,8 @@
   int r =   pyHexDumpFrame(p0,p1); 
   return tp_number(r);
 }
-// getVideoDuration -> double editor->getVideoDuration (void ) 
-static tp_obj zzpy_getVideoDuration(TP)
+// getDts -> double pyGetDts (IEditor int ) 
+static tp_obj zzpy_getDts(TP)
  {
   tp_obj self = tp_getraw(tp);
   IScriptEngine *engine = (IScriptEngine*)tp_get(tp, tp->builtins, tp_string("userdata")).data.val;
@@ -36,11 +47,13 @@
   TinyParams pm(tp);
   void *me = (void *)pm.asThis(&self, ADM_PYID_EDITOR);
 
-  double r =   editor->getVideoDuration(); 
+  IEditor *p0 = editor;
+  int p1 = pm.asInt();
+  double r =   pyGetDts(p0,p1); 
   return tp_number(r);
 }
-// getDts -> double pyGetDts (IEditor int ) 
-static tp_obj zzpy_getDts(TP)
+// getPts -> double pyGetPts (IEditor int ) 
+static tp_obj zzpy_getPts(TP)
  {
   tp_obj self = tp_getraw(tp);
   IScriptEngine *engine = (IScriptEngine*)tp_get(tp, tp->builtins, tp_string("userdata")).data.val;
@@ -50,11 +63,11 @@
 
   IEditor *p0 = editor;
   int p1 = pm.asInt();
-  double r =   pyGetDts(p0,p1); 
+  double r =   pyGetPts(p0,p1); 
   return tp_number(r);
 }
-// dumpSegment -> void editor->dumpSegment (int ) 
-static tp_obj zzpy_dumpSegment(TP)
+// getVideoDuration -> double editor->getVideoDuration (void ) 
+static tp_obj zzpy_getVideoDuration(TP)
  {
   tp_obj self = tp_getraw(tp);
   IScriptEngine *engine = (IScriptEngine*)tp_get(tp, tp->builtins, tp_string("userdata")).data.val;
@@ -62,12 +75,11 @@
   TinyParams pm(tp);
   void *me = (void *)pm.asThis(&self, ADM_PYID_EDITOR);
 
-  int p0 = pm.asInt();
-  editor->dumpSegment(p0); 
- return tp_None;
+  double r =   editor->getVideoDuration(); 
+  return tp_number(r);
 }
-// dumpRefVideo -> int editor->dumpRefVideos (void ) 
-static tp_obj zzpy_dumpRefVideo(TP)
+// nextFrame -> int pyNextFrame (IEditor ) 
+static tp_obj zzpy_nextFrame(TP)
  {
   tp_obj self = tp_getraw(tp);
   IScriptEngine *engine = (IScriptEngine*)tp_get(tp, tp->builtins, tp_string("userdata")).data.val;
@@ -75,11 +87,12 @@
   TinyParams pm(tp);
   void *me = (void *)pm.asThis(&self, ADM_PYID_EDITOR);
 
-  int r =   editor->dumpRefVideos(); 
+  IEditor *p0 = editor;
+  int r =   pyNextFrame(p0); 
   return tp_number(r);
 }
-// nbSegments -> int editor->getNbSegment (void ) 
-static tp_obj zzpy_nbSegments(TP)
+// dumpRefVideo -> int editor->dumpRefVideos (void ) 
+static tp_obj zzpy_dumpRefVideo(TP)
  {
   tp_obj self = tp_getraw(tp);
   IScriptEngine *engine = (IScriptEngine*)tp_get(tp, tp->builtins, tp_string("userdata")).data.val;
@@ -87,11 +100,11 @@
   TinyParams pm(tp);
   void *me = (void *)pm.asThis(&self, ADM_PYID_EDITOR);
 
-  int r =   editor->getNbSegment(); 
+  int r =   editor->dumpRefVideos(); 
   return tp_number(r);
 }
-// dumpAllSegments -> void editor->dumpSegments (void ) 
-static tp_obj zzpy_dumpAllSegments(TP)
+// printTiming -> int pyPrintTiming (IEditor int ) 
+static tp_obj zzpy_printTiming(TP)
  {
   tp_obj self = tp_getraw(tp);
   IScriptEngine *engine = (IScriptEngine*)tp_get(tp, tp->builtins, tp_string("userdata")).data.val;
@@ -99,11 +112,13 @@
   TinyParams pm(tp);
   void *me = (void *)pm.asThis(&self, ADM_PYID_EDITOR);
 
-  editor->dumpSegments(); 
- return tp_None;
+  IEditor *p0 = editor;
+  int p1 = pm.asInt();
+  int r =   pyPrintTiming(p0,p1); 
+  return tp_number(r);
 }
-// getFrameSize -> int editor->getFrameSize (int ) 
-static tp_obj zzpy_getFrameSize(TP)
+// dumpSegment -> void editor->dumpSegment (int ) 
+static tp_obj zzpy_dumpSegment(TP)
  {
   tp_obj self = tp_getraw(tp);
   IScriptEngine *engine = (IScriptEngine*)tp_get(tp, tp->builtins, tp_string("userdata")).data.val;
@@ -112,11 +127,11 @@
   void *me = (void *)pm.asThis(&self, ADM_PYID_EDITOR);
 
   int p0 = pm.asInt();
-  int r =   editor->getFrameSize(p0); 
-  return tp_number(r);
+  editor->dumpSegment(p0); 
+ return tp_None;
 }
-// getPts -> double pyGetPts (IEditor int ) 
-static tp_obj zzpy_getPts(TP)
+// dumpAllSegments -> void editor->dumpSegments (void ) 
+static tp_obj zzpy_dumpAllSegments(TP)
  {
   tp_obj self = tp_getraw(tp);
   IScriptEngine *engine = (IScriptEngine*)tp_get(tp, tp->builtins, tp_string("userdata")).data.val;
@@ -124,10 +139,8 @@
   TinyParams pm(tp);
   void *me = (void *)pm.asThis(&self, ADM_PYID_EDITOR);
 
-  IEditor *p0 = editor;
-  int p1 = pm.asInt();
-  double r =   pyGetPts(p0,p1); 
-  return tp_number(r);
+  editor->dumpSegments(); 
+ return tp_None;
 }
 tp_obj zzpy__pyEditor_get(tp_vm *vm)
 {
@@ -137,45 +150,49 @@
   TinyParams pm(vm);
   void *me=(void *)pm.asThis(&self, ADM_PYID_EDITOR);
   char const *key = pm.asString();
-  if (!strcmp(key, "printTiming"))
+  if (!strcmp(key, "getFrameSize"))
   {
-     return tp_method(vm, self, zzpy_printTiming);
+     return tp_method(vm, self, zzpy_getFrameSize);
   }
-  if (!strcmp(key, "hexDumpFrame"))
+  if (!strcmp(key, "nbSegments"))
   {
-     return tp_method(vm, self, zzpy_hexDumpFrame);
+     return tp_method(vm, self, zzpy_nbSegments);
   }
-  if (!strcmp(key, "getVideoDuration"))
+  if (!strcmp(key, "hexDumpFrame"))
   {
-     return tp_method(vm, self, zzpy_getVideoDuration);
+     return tp_method(vm, self, zzpy_hexDumpFrame);
   }
   if (!strcmp(key, "getDts"))
   {
      return tp_method(vm, self, zzpy_getDts);
   }
-  if (!strcmp(key, "dumpSegment"))
+  if (!strcmp(key, "getPts"))
   {

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ADM_ffNvEnc.cpp Changed

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoEncoder/xvid4/xvid4Dialog.cpp Changed

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/asciiView/ADM_vidAscii.cpp Changed

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/DIA_flyAsharp.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/asharp/DIA_flyAsharp.cpp Changed

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.cpp Changed

@@ -39,7 +39,7 @@
 */
 blackenBorders::blackenBorders( ADM_coreVideoFilter *in,CONFcouple *setup) : ADM_coreVideoFilter(in,setup)
 {
-	 if(!setup || !ADM_paramLoad(setup,blackenBorder_param,&param))
+    if(!setup || !ADM_paramLoad(setup,blackenBorder_param,&param))
     {
         // Default value
         param.left=0;
@@ -142,48 +142,16 @@
 /**
     \fn configure
 */
+extern bool DIA_getBlackenParams(	blackenBorder *param,ADM_coreVideoFilter *in);
 bool blackenBorders::configure(void)
 {
-        uint32_t width,height;
-#define MAKEME(x) uint32_t x=param.x;
-        while(1)
-        {
-          MAKEME(left);
-          MAKEME(right);
-          MAKEME(top);
-          MAKEME(bottom);
+    
+        bool r=DIA_getBlackenParams(	&param,previousFilter);
+        if(!r) return false;        
+        // sanity check, todo
+        return true;
 
-          width=previousFilter->getInfo()->width;
-          height=previousFilter->getInfo()->height;
-
-          diaElemUInteger dleft(&left,QT_TRANSLATE_NOOP("blacken","_Left border:"),       0,width/2);
-          diaElemUInteger dright(&right,QT_TRANSLATE_NOOP("blacken","_Right border:"),    0,width/2);
-          diaElemUInteger dtop(&(top),QT_TRANSLATE_NOOP("blacken","_Top border:"),          0,height/2);
-          diaElemUInteger dbottom(&(bottom),QT_TRANSLATE_NOOP("blacken","_Bottom border:"), 0,height/2);
-
-          diaElem *elems[4]={&dleft,&dright,&dtop,&dbottom};
-          if(diaFactoryRun(QT_TRANSLATE_NOOP("blacken","Blacken Borders"),4,elems))
-          {
-            if((left&1) || (right&1)|| (top&1) || (bottom&1))
-            {
-              GUI_Error_HIG(QT_TRANSLATE_NOOP("blacken","Incorrect parameters"),QT_TRANSLATE_NOOP("blacken","All parameters must be even and within range."));
-              continue;
-            }
-            else
-            {
-  #undef MAKEME
-  #define MAKEME(x) param.x=x;
-                MAKEME(left);
-                MAKEME(right);
-                MAKEME(top);
-                MAKEME(bottom);
-                return true;
-            }
-          }
-          return false;
-      }
 }
-
-
+// EOF

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/ADM_vidBlackBorder.h Changed

@@ -14,35 +14,33 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#ifndef __BLACKEN_BORDER__
-#define     __BLACKEN_BORDER__
-
+#pragma once
 #include "blackenBorder.h"
 class blackenBorders : public  ADM_coreVideoFilter
 {
 protected:
-        blackenBorder   param;
+        blackenBorder       param;
 public:
-                    blackenBorders(ADM_coreVideoFilter *previous,CONFcouple *conf);
-                    ~blackenBorders();
+                            blackenBorders(ADM_coreVideoFilter *previous,CONFcouple *conf);
+                            ~blackenBorders();
 
         virtual const char   *getConfiguration(void);                   /// Return  current configuration as a human readable string
         virtual bool         getNextFrame(uint32_t *fn,ADMImage *image);    /// Return the next image
 	 //  virtual FilterInfo  *getInfo(void);                             /// Return picture parameters after this filter
         virtual bool         getCoupledConf(CONFcouple **couples) ;   /// Return the current filter configuration
-        virtual void setCoupledConf(CONFcouple *couples);
+        virtual void         setCoupledConf(CONFcouple *couples);
         virtual bool         configure(void) ;           /// Start graphical user interface
 };
 
-// Add the hook to make it valid plugin
+
 DECLARE_VIDEO_FILTER(   blackenBorders,   // Class
                         1,0,0,              // Version
-                        ADM_UI_ALL,         // UI
+                        ADM_UI_TYPE_BUILD,         // UI
                         VF_TRANSFORM,            // Category
                         "blackenBorder",            // internal name (must be uniq!)
                         QT_TRANSLATE_NOOP("blacken","Blacken Borders"),            // Display name
                         QT_TRANSLATE_NOOP("blacken","Remove noisy edge by turning them to black.") // Description
                     );
 
+// EOF
 
-#endif

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/CMakeLists.txt -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/CMakeLists.txt Changed

avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/cli Added

avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/cli/DIA_blackenBorders.cpp Added

@@ -0,0 +1,36 @@
+/***************************************************************************
+                          DIA_crop.cpp  -  description
+                             -------------------
+
+			    GUI for cropping including autocrop
+			    +Revisted the Gtk2 way
+			     +Autocrop now in RGB space (more accurate)
+
+    begin                : Fri May 3 2002
+    copyright            : (C) 2002/2007 by mean
+    email                : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#include <stdint.h>
+#include "ADM_default.h"
+#include "ADM_coreVideoFilter.h"
+
+#include "../blackenBorder.h"
+/**
+      \fn     DIA_getCropParams
+      \brief  Handle crop dialog
+*/
+bool DIA_getBlackenParams(	blackenBorder *param,ADM_coreVideoFilter *in)
+{
+    return false;
+}
+//____________________________________
+// EOF

avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4 Added

avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/DIA_flyBlackenBorders.cpp Added

@@ -0,0 +1,97 @@
+/***************************************************************************
+                          DIA_flyCrop.cpp  -  description
+                             -------------------
+
+        Common part of the crop dialog
+    
+    copyright            : (C) 2002/2007 by mean
+    email                : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#include "DIA_flyDialogQt4.h"
+#include "ADM_default.h"
+#include "ADM_image.h"
+#include "DIA_flyBlackenBorders.h"
+
+
+/**
+    \fn process
+	\brief 
+*/
+uint8_t    flyBlacken::processRgb(uint8_t *imageIn, uint8_t *imageOut)
+{
+        uint32_t x,y;
+        uint8_t  *in;
+        uint32_t w=_w,h=_h;
+  
+        
+        memcpy(imageOut,imageIn,_w*_h*4);
+        in=imageOut;
+        for(y=0;y<top;y++)
+        {
+                for(x=0;x<w;x++)
+                {
+                        *in++=0;
+                        
+                        
+                        *in++=0xff;
+                        
+                        *in++=0;
+                        *in++=0;
+                }
+        }
+        // bottom
+        in=imageOut+(w*4)*(h-bottom);
+        for(y=0;y<bottom;y++)
+        {
+                for(x=0;x<w;x++)
+                {
+                        *in++=0;
+                        
+                        
+                        *in++=0xff;
+                        *in++=0;
+                        *in++=0;
+                }
+        }
+        // left
+        in=imageOut;
+        uint32_t stride=4*w-4;
+        for(y=0;y<h;y++)
+        {
+                for(x=0;x<left;x++)
+                {
+                        *(in+4*x)=0;
+                        
+                        
+                        *(in+4*x+1)=0xff;
+                        *(in+4*x+2)=0;
+                        *(in+4*x+3)=0;
+                }
+                for(x=0;x<right;x++)
+                {
+                        *(in-4*x+stride-4)=0;
+                        
+                        
+                        *(in-4*x+stride-3)=0xff;
+                        *(in-4*x+stride-2)=0;
+                        *(in-4*x+stride-1)=0;
+                        
+                }
+                in+=4*w;
+  
+        }
+        return true;
+
+}
+
+//EOF
+

avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/DIA_flyBlackenBorders.h Added

avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/Q_blackenBorders.cpp Added

@@ -0,0 +1,158 @@
+/***************************************************************************                         
+    copyright            : (C) 2002/2017 by mean
+    email                : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#include "Q_blackenBorders.h"
+#include "ADM_toolkitQt.h"
+
+//
+//	Video is in RGB Colorspace
+//
+//
+Ui_blackenWindow::Ui_blackenWindow(QWidget* parent, blackenBorder *param,ADM_coreVideoFilter *in) : QDialog(parent)
+  {
+    uint32_t width,height;
+    ui.setupUi(this);    
+    lock=0;
+    // Allocate space for green-ised video
+    width=in->getInfo()->width;
+    height=in->getInfo()->height;
+
+    canvas=new ADM_QCanvas(ui.graphicsView,width,height);
+    
+    myBlacken=new flyBlacken( this,width, height,in,canvas,ui.horizontalSlider);
+    myBlacken->left=param->left;
+    myBlacken->right=param->right;
+    myBlacken->top=param->top;
+    myBlacken->bottom=param->bottom;
+    myBlacken->_cookie=&ui;
+    myBlacken->addControl(ui.toolboxLayout);
+    myBlacken->upload();
+    myBlacken->sliderChanged();
+
+
+    connect( ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
+    connect( ui.pushButtonReset,SIGNAL(clicked(bool)),this,SLOT(reset(bool)));
+#define SPINNER(x) connect( ui.spinBox##x,SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int))); 
+    SPINNER(Left);
+    SPINNER(Right);
+    SPINNER(Top);
+    SPINNER(Bottom);
+
+  }
+  void Ui_blackenWindow::sliderUpdate(int foo)
+  {
+    myBlacken->sliderChanged();
+  }
+  void Ui_blackenWindow::gather(blackenBorder *param)
+  {
+
+    myBlacken->download();
+    param->left=myBlacken->left;
+    param->right=myBlacken->right;
+    param->top=myBlacken->top;
+    param->bottom=myBlacken->bottom;
+}
+Ui_blackenWindow::~Ui_blackenWindow()
+{
+  if(myBlacken) 
+      delete myBlacken;
+  myBlacken=NULL; 
+  if(canvas) 
+      delete canvas;
+  canvas=NULL;
+}
+void Ui_blackenWindow::valueChanged( int f )
+{
+  if(lock) return;
+  lock++;
+  myBlacken->download();
+  myBlacken->sameImage();
+  lock--;
+}
+
+void Ui_blackenWindow::reset( bool f )
+{
+    myBlacken->left=0;
+    myBlacken->right=0;
+    myBlacken->bottom=0;
+    myBlacken->top=0;
+    lock++;
+    myBlacken->upload();
+    myBlacken->sameImage();
+    lock--;
+}
+
+//************************
+uint8_t flyBlacken::upload(void)
+{
+Ui_blackenDialog *w=(Ui_blackenDialog *)_cookie;
+
+    w->spinBoxLeft->setValue(left);
+    w->spinBoxRight->setValue(right);
+    w->spinBoxTop->setValue(top);
+    w->spinBoxBottom->setValue(bottom);
+    return 1;
+}
+uint8_t flyBlacken::download(void)
+{
+    int reject=0;
+    Ui_blackenDialog *w=(Ui_blackenDialog *)_cookie;
+#define SPIN_GET(x,y) x=w->spinBox##y->value();
+        SPIN_GET(left,Left);
+        SPIN_GET(right,Right);
+        SPIN_GET(top,Top);
+        SPIN_GET(bottom,Bottom);
+
+        printf("%d %d %d %d\n",left,right,top,bottom);
+
+        left&=0xffffe;
+        right&=0xffffe;
+        top&=0xffffe;
+        bottom&=0xffffe;
+
+        if((top+bottom)>_h)
+                {
+                        top=bottom=0;
+                        reject=1;
+                }
+        if((left+right)>_w)
+                {
+                        left=right=0;
+                        reject=1;
+                }
+        if(reject)
+                upload();
+        return true;
+}
+
+/**
+      \fn     DIA_getCropParams
+      \brief  Handle crop dialog
+*/
+bool DIA_getBlackenParams(	blackenBorder *param,ADM_coreVideoFilter *in)
+{
+    bool ret=0;
+
+    Ui_blackenWindow dialog(qtLastRegisteredDialog(), param,in);
+    qtRegisterDialog(&dialog);
+
+    if(dialog.exec()==QDialog::Accepted)
+    {
+        dialog.gather(param); 
+        ret=1;
+    }
+    qtUnregisterDialog(&dialog);
+    return ret;
+}
+//____________________________________
+// EOF

avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/Q_blackenBorders.h Added

avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/blackenBorder/qt4/blackenBorders.ui Added

@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>blackenDialog</class>
+ <widget class="QDialog" name="blackenDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>507</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Blacken Borders</string>
+  </property>
+  <layout class="QVBoxLayout">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="leftMargin">
+    <number>9</number>
+   </property>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
+   </property>
+   <item>
+    <layout class="QGridLayout">
+     <property name="leftMargin">
+      <number>0</number>
+     </property>
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
+      <number>0</number>
+     </property>
+     <property name="spacing">
+      <number>6</number>
+     </property>
+     <item row="0" column="3">
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>Right:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_4">
+       <property name="text">
+        <string>Top:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="4">
+      <widget class="QSpinBox" name="spinBoxRight">
+       <property name="maximum">
+        <number>2147483647</number>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="2">
+      <spacer>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>26</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="1" column="5">
+      <spacer>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="1" column="6">
+      <widget class="QPushButton" name="pushButtonReset">
+       <property name="text">
+        <string>Reset</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QSpinBox" name="spinBoxTop">
+       <property name="maximum">
+        <number>2147483647</number>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="4">
+      <widget class="QSpinBox" name="spinBoxBottom">
+       <property name="maximum">
+        <number>2147483647</number>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="3">
+      <widget class="QLabel" name="label_3">
+       <property name="text">
+        <string>Bottom:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Left:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="5">
+      <spacer>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::MinimumExpanding</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="0" column="1">
+      <widget class="QSpinBox" name="spinBoxLeft">
+       <property name="maximum">
+        <number>2147483647</number>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="2">
+      <spacer>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>26</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="toolboxLayout"/>
+   </item>
+   <item>
+    <widget class="QSlider" name="horizontalSlider">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGraphicsView" name="graphicsView"/>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/changeFps/changeFps.cpp Changed

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.cpp Changed

@@ -57,12 +57,19 @@
 #define SPINNER(x) connect( ui.dial##x,SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int))); 
           SPINNER(Brightness);
           SPINNER(Contrast);
-          
-        QString title=QString("Contrast: %1 %").arg((int)(100*myCrop->param.coef));
-        QString title2=QString("Brightness: %2").arg(myCrop->param.offset);
-        ui.labelContrast->setText(title);
-        ui.labelBrightness->setText(title2);
-          
+
+        setDialTitles();
+        // Allocate enough width for dial titles to avoid shifting elements of the dialog
+        // on transition e.g. 100% <-> 99% with large font sizes
+        QString text=QString(QT_TRANSLATE_NOOP("contrast","Contrast"))+QString(": 100 %");
+        QString text2=QString(QT_TRANSLATE_NOOP("contrast","Brightness"))+QString(": -100");
+        QFontMetrics fm=ui.labelContrast->fontMetrics();
+        QFontMetrics fm2=ui.labelBrightness->fontMetrics();
+        int labelContrastWidth=fm.boundingRect(text).width()+8; // 8px security margin
+        int labelBrightnessWidth=fm2.boundingRect(text2).width()+8; // 8px security margin
+        ui.labelContrast->setMinimumWidth(labelContrastWidth);
+        ui.labelBrightness->setMinimumWidth(labelBrightnessWidth);
+
           connect( ui.checkBoxU,SIGNAL(stateChanged(int)),this,SLOT(valueChanged(int)));
           connect( ui.checkBoxV,SIGNAL(stateChanged(int)),this,SLOT(valueChanged(int))); 
           connect( ui.checkBoxY,SIGNAL(stateChanged(int)),this,SLOT(valueChanged(int)));  
@@ -108,10 +115,7 @@
   myCrop->param.offset=-16;
   myCrop->upload();
   myCrop->sameImage();
-  QString title=QString("Contrast: %1 %").arg((int)(100*myCrop->param.coef));
-  QString title2=QString("Brightness: %2").arg(myCrop->param.offset);
-  ui.labelContrast->setText(title);
-  ui.labelBrightness->setText(title2);
+  setDialTitles();
   lock--;
 }
 /**
@@ -134,13 +138,21 @@
   lock++;
   myCrop->download();
   myCrop->sameImage();
-  QString title=QString("Contrast: %1 %").arg((int)(100*myCrop->param.coef));
-  QString title2=QString("Brightness: %2").arg(myCrop->param.offset);
-  ui.labelContrast->setText(title);
-  ui.labelBrightness->setText(title2);
+  setDialTitles();
   lock--;
 }
 
+/**
+ *    \fn setDialTitles
+ */
+void Ui_contrastWindow::setDialTitles(void)
+{
+    QString title=QString(QT_TRANSLATE_NOOP("contrast","Contrast"))+QString(": %1 %").arg((int)(100*myCrop->param.coef));
+    QString title2=QString(QT_TRANSLATE_NOOP("contrast","Brightness"))+QString(": %2").arg(myCrop->param.offset);
+    ui.labelContrast->setText(title);
+    ui.labelBrightness->setText(title2);
+}
+
 #define MYSPIN(x) w->dial##x
 #define MYCHECK(x) w->checkBox##x
 /**

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.h -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/contrast/qt4/Q_contrast.h Changed

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/crop/ADM_vidCrop.cpp Changed

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/qt4/DIA_flyHue.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/hue/qt4/DIA_flyHue.cpp Changed

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.cpp Changed

@@ -1,16 +1,12 @@
 /***************************************************************************
-                          ADM_vidMSharpen  -  description
-                             -------------------
-    
-    email                : fixounet@free.fr
-
+    \file ADM_vidMSharpen 
+ * 
     Port of Donal Graft Msharpen which is (c) Donald Graft
     http://www.neuron2.net
     http://puschpull.org/avisynth/decomb_reference_manual.html
 
         It is a bit less efficient as we do hz & vz blur separately
-        The formula has been changed a bit from 1 1 1 to 1 2 1
-        for speed aspect & MMX  
+        The formula has been changed a bit from 1 1 1 to 1 2 1 for speed aspect & MMX  
         Mean
 
  ***************************************************************************/
@@ -33,45 +29,14 @@
 	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "ADM_default.h"
-#include "DIA_factory.h"
-#include "ADM_coreVideoFilter.h"
-#include "msharpen.h"
-#include "msharpen_desc.cpp"
-/**
-    \class Msharpen
-*/
-class Msharpen : public ADM_coreVideoFilterCached
-{
-private:
-        msharpen	_param;
-        ADMImage        *blurrImg,*work;
-
-        uint32_t        invstrength;
-
-                void    detect_edges(ADMImage *src, ADMImage *dst, int plane);
-                void    blur_plane(ADMImage *src, ADMImage *blur, int plane) ;
-                void    detect_edges_HiQ(ADMImage *src, ADMImage *dst, int plane);
-                void    apply_filter(ADMImage *src,ADMImage *blur, ADMImage *dst,int plane) ;
-public:    
-
-                            Msharpen(ADM_coreVideoFilter *in,CONFcouple *couples)   ;
-                            ~Msharpen();
-
-       virtual const char  *getConfiguration(void);          /// Return  current configuration as a human readable string
-       virtual bool         getNextFrame(uint32_t *fn,ADMImage *image);    /// Return the next image
-       virtual bool         getCoupledConf(CONFcouple **couples) ;   /// Return the current filter configuration
-       virtual void         setCoupledConf(CONFcouple *couples);
-       virtual bool         configure(void) ;                 /// Start graphical user interface        
-       
-};
-//********** Register chunk ************
 
+#include "ADM_vidMSharpen.h"
+#include "msharpen_desc.cpp"
 // DECLARE FILTER 
-
+extern bool DIA_msharpen(msharpen &param, ADM_coreVideoFilter *source);
 DECLARE_VIDEO_FILTER(   Msharpen,   // Class
                         1,0,0,              // Version
-                        ADM_UI_ALL,         // UI
+                        ADM_UI_TYPE_BUILD,         // UI
                         VF_SHARPNESS,            // Category
                         "msharpen",            // internal name (must be uniq!)
                         QT_TRANSLATE_NOOP("msharpen","Msharpen"),            // Display name
@@ -121,32 +86,6 @@
     work=NULL;
 }
 /**
-    \fn configure
-*/
-bool Msharpen::configure(void)
-{
-uint8_t r=0;
-
-#define PX(x) &(_param.x)
-  
-        
-    diaElemToggle    mask(PX(mask),QT_TRANSLATE_NOOP("msharpen","_Mask"));
-    diaElemToggle    highq(PX(highq),QT_TRANSLATE_NOOP("msharpen","_High Q"));
-    
-    diaElemUInteger   threshold(PX(threshold),QT_TRANSLATE_NOOP("msharpen","_Threshold:"),1,255);
-    diaElemUInteger   strength(PX(strength),QT_TRANSLATE_NOOP("msharpen","_Strength:"),1,255);
-    
-    
-  diaElem *elems[4]={&mask,&highq,&threshold,&strength};
-
-  if(diaFactoryRun(QT_TRANSLATE_NOOP("msharpen","MSharpen"),4,elems))
-  {
-         invstrength=255-_param.strength;
-         return 1;
-  }
-  return 0;
-}
-/**
     \fn getConfiguration
 */
 const char *Msharpen::getConfiguration(void)
@@ -176,12 +115,12 @@
     for (int i=0;i<3;i++)
     {
             
-            blur_plane(src, blur, i);
-            detect_edges(blur, dst,  i);
+            blur_plane(src, blur, i,work);
+            detect_edges(blur, dst,  i,_param);
             if (_param.highq == true)
-                detect_edges_HiQ(blur, dst,  i);
+                detect_edges_HiQ(blur, dst,  i,_param);
             if (!_param.mask) 
-                apply_filter(src, blur, dst,  i);
+                apply_filter(src, blur, dst,  i,_param,invstrength);
     }
 
     *fn=nextFrame;
@@ -197,7 +136,7 @@
  *  are processed independently.
  *********************************/
 
-void Msharpen::blur_plane(ADMImage *src, ADMImage *blur, int plane) 
+void Msharpen::blur_plane(ADMImage *src, ADMImage *blur, int plane,ADMImage *work) 
 {
 /*
   uint64_t mask1 = 0x00001C711C711C71LL;
@@ -370,7 +309,7 @@
  * @param dst
  * @param plane
  */
-void Msharpen::detect_edges(ADMImage *src, ADMImage *dst,  int plane) 
+void Msharpen::detect_edges(ADMImage *src, ADMImage *dst,  int plane,const msharpen &param) 
 {
   int ww,hh;
 
@@ -401,7 +340,7 @@
             n=srcpn[xx+1];
             c=srcpn[xx-1];
 
-            if(abs(n-p)>_param.threshold || abs(c-p)>_param.threshold) dstp[xx+1]=0xff;
+            if(abs(n-p)>param.threshold || abs(c-p)>param.threshold) dstp[xx+1]=0xff;
                             else dstp[xx+1]=0;
 
         }
@@ -409,7 +348,7 @@
       srcpn+=src_pitch;
       dstp+=dst_pitch;
      }
-  if (_param.mask) 
+  if (param.mask) 
   {
     dstp=dstp_saved;
     memset(dstp_saved+(hh-1)*dst_pitch,0,ww);  // Not used, if not returning mask
@@ -424,7 +363,7 @@
 }
 
 //***************************************************
-void Msharpen::detect_edges_HiQ(ADMImage *src, ADMImage *dst, int plane) 
+void Msharpen::detect_edges_HiQ(ADMImage *src, ADMImage *dst, int plane,const msharpen &param) 
 {
 // Vertical detail detection
   unsigned char *srcp,*srcp_saved; 
@@ -464,7 +403,7 @@
     for (int y=0;y<h-1;dstp+=dst_pitch,srcp+=src_pitch,srcpn+=src_pitch,y++)
     {
       b2=srcpn[x];
-      if (abs(b1-b2)>=_param.threshold)
+      if (abs(b1-b2)>=param.threshold)
         dstp[x]=255;
       b1=b2;
     }
@@ -479,7 +418,7 @@
     for (int x=0;x<w-1;x++)
     {
       b2=srcp[x+1];
-      if (abs(b1-b2)>=_param.threshold)
+      if (abs(b1-b2)>=param.threshold)
         dstp[x]=255;
       b1=b2;
     }
@@ -499,7 +438,7 @@
   }
 }
 //***************************************************
-void Msharpen::apply_filter(ADMImage *src,ADMImage *blur, ADMImage *dst, int plane) 
+void Msharpen::apply_filter(ADMImage *src,ADMImage *blur, ADMImage *dst, int plane,const msharpen &param,uint32_t invstrength) 
 {
   // TODO: MMX / ISSE
   const unsigned char *srcp ;
@@ -563,7 +502,7 @@
         else 
             if (b4>255) 
                 b4=255;
-        dstp[x]=(_param.strength*b4+invstrength*(int)(srcp[x]))>>8;
+        dstp[x]=(param.strength*b4+invstrength*(int)(srcp[x]))>>8;
       }
       else

avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/ADM_vidMSharpen.h Added

@@ -0,0 +1,70 @@
+/***************************************************************************
+                          ADM_vidMSharpen  -  description
+                             -------------------
+    
+    email                : fixounet@free.fr
+
+    Port of Donal Graft Msharpen which is (c) Donald Graft
+    http://www.neuron2.net
+    http://puschpull.org/avisynth/decomb_reference_manual.html
+
+        It is a bit less efficient as we do hz & vz blur separately
+        The formula has been changed a bit from 1 1 1 to 1 2 1
+        for speed aspect & MMX  
+        Mean
+
+ ***************************************************************************/
+/*
+	Msharpen plugin for Avisynth -- performs detail-preserving smoothing.
+
+	Copyright (C) 2003 Donald A. Graft
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation.
+
+	This program 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 General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+#pragma once
+#include "ADM_default.h"
+#include "DIA_factory.h"
+#include "ADM_coreVideoFilter.h"
+#include "msharpen.h"
+
+/**
+    \class Msharpen
+*/
+class Msharpen : public ADM_coreVideoFilterCached
+{
+private:
+        msharpen	_param;
+        ADMImage        *blurrImg,*work;
+
+        uint32_t        invstrength;
+
+public:    
+
+                            Msharpen(ADM_coreVideoFilter *in,CONFcouple *couples)   ;
+                            ~Msharpen();
+
+       virtual const char  *getConfiguration(void);          /// Return  current configuration as a human readable string
+       virtual bool         getNextFrame(uint32_t *fn,ADMImage *image);    /// Return the next image
+       virtual bool         getCoupledConf(CONFcouple **couples) ;   /// Return the current filter configuration
+       virtual void         setCoupledConf(CONFcouple *couples);
+       virtual bool         configure(void) ;                 /// Start graphical user interface        
+public:
+       static  void    detect_edges(ADMImage *src, ADMImage *dst, int plane,const msharpen &param);
+       static  void    blur_plane(ADMImage *src, ADMImage *blur, int plane,ADMImage *work) ;
+       static  void    detect_edges_HiQ(ADMImage *src, ADMImage *dst, int plane,const msharpen &param);
+       static  void    apply_filter(ADMImage *src,ADMImage *blur, ADMImage *dst,int plane,const msharpen &param,uint32_t invstrength) ;
+
+
+       
+};

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/CMakeLists.txt -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/CMakeLists.txt Changed

avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/cli Added

avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/cli/DIA_flymsharpen.cpp Added

avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/qt4 Added

avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/DIA_flymsharpen.cpp Added

@@ -0,0 +1,161 @@
+/***************************************************************************
+                          DIA_flyMSharpen
+                             -------------------
+
+                           Ui for msharpen
+    copyright            : (C) 2004/2017 by mean
+    email                : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#include "DIA_flyDialogQt4.h"
+#include "QSizeGrip"
+#include "QHBoxLayout"
+#include "ADM_default.h"
+#include "ADM_image.h"
+#include "msharpen.h"
+#include "DIA_flymsharpen.h"
+#include "ADM_vidMSharpen.h"
+#include "Q_msharpen.h"
+#include "ADM_toolkitQt.h"
+
+
+#if 0
+#define aprintf printf
+#else
+#define aprintf(...) {}
+#endif
+
+
+/**
+ * 
+ * @param parent
+ * @param width
+ * @param height
+ * @param in
+ * @param canvas
+ * @param slider
+ */
+ flyMSharpen::flyMSharpen (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
+                                    ADM_QCanvas *canvas, QSlider *slider) : 
+                ADM_flyDialogYuv(parent,width, height,in,canvas, slider,RESIZE_AUTO) 
+ {
+     blur=  new ADMImageDefault(_w/2,_h);
+     work=  new ADMImageDefault(_w,_h);;     //<-dafuq ?
+ }
+ /**
+  * 
+  */
+flyMSharpen::~flyMSharpen()
+{
+    delete blur;
+    delete work;
+    blur=NULL;
+    work=NULL;
+}
+
+
+/**
+    \fn process
+*/
+uint8_t    flyMSharpen::processYuv(ADMImage* in, ADMImage *out)
+{        
+    
+    ADMImageRef          refIn(_w/2,_h);
+    ADMImageRefWrittable refOut(_w/2,_h);
+    
+    in->copyLeftSideTo(out);
+    
+    for(int i=0;i<3;i++)
+    {
+        int halfWidth=in->GetWidth((ADM_PLANE)i)/2; // in and out have the same width
+        refIn._planeStride[i] =in->_planeStride[i];
+        refOut._planeStride[i]=out->_planeStride[i];
+        refIn._planes[i]      =in->_planes[i];//+halfWidth;
+        refOut._planes[i]     =out->_planes[i]+halfWidth;
+    }
+    
+    for (int i=0;i<3;i++)
+    { 
+            Msharpen::blur_plane(&refIn, blur, i,work);
+            Msharpen::detect_edges(blur, &refOut,  i,param);
+            if (param.highq == true)
+                Msharpen::detect_edges_HiQ(blur, &refOut,  i,param);
+            if (!param.mask) 
+                Msharpen::apply_filter(&refIn, blur, &refOut,  i,param,invstrength);
+    }
+    out->copyInfo(in);
+    out->printString(1,1,"Original"); // printString can't handle non-ascii input, do not translate this!
+    out->printString(in->GetWidth(PLANAR_Y)/24+1,1,"Processed"); // as above, don't try to translate
+
+    return 1;
+}
+
+/**
+ * \fn upload
+ * @return 
+ */
+uint8_t flyMSharpen::upload()
+{
+#define MYSPIN(x) w->x
+#define MYTOGGLE(x) w->x
+    Ui_msharpenDialog *w=(Ui_msharpenDialog *)_cookie;
+    
+    
+    MYSPIN(spinBoxThreshold)->setValue(param.threshold);
+    MYSPIN(spinBoxStrength)->setValue(param.strength);
+    MYTOGGLE(CheckBoxHQ)->setChecked(param.highq);
+    MYTOGGLE(checkBoxMask)->setChecked(param.mask);
+    invstrength=255-param.strength;	
+    printf("Upload\n");
+    return 1;
+}
+/**
+        \fn download
+*/
+uint8_t flyMSharpen::download(void)
+{
+    
+#define MYSPIN(x) w->x
+#define MYTOGGLE(x) w->x
+    Ui_msharpenDialog *w=(Ui_msharpenDialog *)_cookie;
+    
+    
+    param.threshold=MYSPIN(spinBoxThreshold)->value();
+    param.strength=MYSPIN(spinBoxStrength)->value();
+    param.highq= MYTOGGLE(CheckBoxHQ)->isChecked();
+    param.mask= MYTOGGLE(checkBoxMask)->isChecked();
+    invstrength=255-param.strength;	
+    printf("Download\n");
+    return true;
+}
+
+/**
+      \fn     DIA_getMpDelogo
+      \brief  Handle delogo dialog
+*/
+bool DIA_msharpen(msharpen &param, ADM_coreVideoFilter *in)
+{
+        bool ret=false;
+        
+        Ui_msharpenWindow dialog(qtLastRegisteredDialog(), &param,in);
+		qtRegisterDialog(&dialog);
+
+        if(dialog.exec()==QDialog::Accepted)
+        {
+            dialog.gather(&param); 
+            ret=true;
+        }
+
+        qtUnregisterDialog(&dialog);
+        return ret;
+}
+
+//EOF

avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/DIA_flymsharpen.h Added

@@ -0,0 +1,37 @@
+/***************************************************************************
+    copyright            : (C) 2011 by mean
+    email                : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#pragma once
+
+#include "msharpen.h"
+/**
+    \class flyMSharpen
+*/
+class flyMSharpen : public ADM_flyDialogYuv
+{
+protected:
+public:
+   msharpen    param;
+   bool        preview;
+   uint32_t    invstrength;
+   ADMImage    *blur,*work;
+public:
+   uint8_t     processYuv(ADMImage* in, ADMImage *out);
+   uint8_t     download(void);
+   uint8_t     upload();
+               flyMSharpen (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
+                                    ADM_QCanvas *canvas, QSlider *slider);
+                
+   virtual     ~flyMSharpen() ;
+};
+// EOF

avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/Q_msharpen.cpp Added

@@ -0,0 +1,89 @@
+/***************************************************************************
+                         Q_Asharp.cpp  -  description
+                             -------------------
+
+			     flyDialog for Asharp
+			     +Revisted the Gtk2 way
+
+    copyright            : (C) 2004/2007 by mean
+    email                : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "Q_msharpen.h"
+#include "ADM_toolkitQt.h"
+
+//
+//	Video is in YV12 Colorspace
+//
+//
+  Ui_msharpenWindow::Ui_msharpenWindow(QWidget *parent,  msharpen *param, ADM_coreVideoFilter *in) : QDialog(parent)
+  {
+    uint32_t width,height;
+        ui.setupUi(this);
+        lock=0;
+        // Allocate space for green-ised video
+        width=in->getInfo()->width;
+        height=in->getInfo()->height;
+
+        canvas=new ADM_QCanvas(ui.graphicsView,width,height);
+        
+        flymsharpen=new flyMSharpen( this,width, height,in,canvas,ui.horizontalSlider);
+        memcpy(&(flymsharpen->param),param,sizeof(*param));
+        flymsharpen->_cookie=&ui;
+        flymsharpen->addControl(ui.toolboxLayout);
+        flymsharpen->upload();
+        flymsharpen->sliderChanged();
+
+
+        connect( ui.horizontalSlider,SIGNAL(valueChanged(int)),this,SLOT(sliderUpdate(int)));
+#define SPINNER(x) connect( ui.spinBox##x,SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int))); 
+#define TOGGLER(x) connect( ui.x,SIGNAL(stateChanged(int)),this,SLOT(valueChanged(int))); 
+        
+        TOGGLER(CheckBoxHQ);
+        TOGGLER(checkBoxMask);
+        
+        SPINNER(Threshold);
+        SPINNER(Strength);
+  }
+  void Ui_msharpenWindow::sliderUpdate(int foo)
+  {
+    flymsharpen->sliderChanged();
+  }
+  void Ui_msharpenWindow::gather(msharpen *param)
+  {
+    
+        flymsharpen->download();
+        memcpy(param,&(flymsharpen->param),sizeof(*param));
+  }
+Ui_msharpenWindow::~Ui_msharpenWindow()
+{
+  if(flymsharpen) delete flymsharpen;
+  flymsharpen=NULL; 
+  if(canvas) delete canvas;
+  canvas=NULL;
+}
+void Ui_msharpenWindow::valueChanged( int f )
+{
+  printf("Update \n");
+  if(lock) return;
+  lock++;
+  flymsharpen->download();
+  flymsharpen->sameImage();
+  lock--;
+}
+
+#define MYSPIN(x) w->doubleSpinBox##x
+
+//____________________________________
+// EOF
+
+

avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/Q_msharpen.h Added

avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/mSharpen/qt4/msharpen.ui Added

@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>msharpenDialog</class>
+ <widget class="QDialog" name="msharpenDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>481</width>
+    <height>454</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>MSharpen</string>
+  </property>
+  <property name="modal">
+   <bool>true</bool>
+  </property>
+  <layout class="QGridLayout">
+   <property name="leftMargin">
+    <number>9</number>
+   </property>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
+   </property>
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <item row="2" column="3">
+    <spacer>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="1" column="3">
+    <spacer>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="3">
+    <spacer>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="3" column="0" colspan="3">
+    <widget class="QCheckBox" name="checkBoxMask">
+     <property name="text">
+      <string>Mask</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="3">
+    <spacer>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="5" column="0" colspan="4">
+    <widget class="QSlider" name="horizontalSlider">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="1" colspan="3">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Strength</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="0" colspan="4">
+    <widget class="QGraphicsView" name="graphicsView"/>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>Threshold</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0">
+    <layout class="QHBoxLayout" name="toolboxLayout"/>
+   </item>
+   <item row="2" column="0">
+    <widget class="QCheckBox" name="CheckBoxHQ">
+     <property name="text">
+      <string>HighQuality</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="2">
+    <widget class="QSpinBox" name="spinBoxStrength">
+     <property name="minimum">
+      <number>1</number>
+     </property>
+     <property name="maximum">
+      <number>255</number>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="2">
+    <widget class="QSpinBox" name="spinBoxThreshold">
+     <property name="minimum">
+      <number>1</number>
+     </property>
+     <property name="maximum">
+      <number>255</number>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>msharpenDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>msharpenDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/ADM_vidMPdelogo.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/ADM_vidMPdelogo.cpp Changed

@@ -49,13 +49,13 @@
 MPDelogo::MPDelogo(ADM_coreVideoFilter *in,CONFcouple *couples) : ADM_coreVideoFilter(in,couples)
 {
         if(!couples || !ADM_paramLoad(couples,delogo_param,&param))
-		{
-                param.xoff=0;
-                param.yoff=0;
-                param.lw = info.width>>1;
-                param.lh = info.height>>1;
-                param.band=4;
-                param.show=0;
+        {
+            param.xoff=0;
+            param.yoff=0;
+            param.lw = info.width>>1;
+            param.lh = info.height>>1;
+            param.band=4;
+            param.show=0;
         }
 }
 /**
@@ -89,7 +89,7 @@
 const char   *MPDelogo::getConfiguration(void)   
 {
     static char s[256];
-    snprintf(s,255,"x=%d y=%d w=%d h=%d",(int)param.xoff, (int)param.yoff,(int)param.lw,(int)param.lh);
+    snprintf(s,255,"x=%d y=%d w=%d h=%d bd=%d",(int)param.xoff, (int)param.yoff,(int)param.lw,(int)param.lh,(int)param.band);
     return s;        
 }
 /**
@@ -110,6 +110,7 @@
 bool         MPDelogo::doDelogo(ADMImage *img,  int x,  int y, 
                              int w,  int h,int band, int show)
 {
+     int realBand;
      for(int i=0;i<3;i++)
         {
             ADM_PLANE p=(ADM_PLANE)i;
@@ -117,16 +118,20 @@
             int width=img->GetWidth(p);
             int height=img->GetHeight(p);
             int stride=img->GetPitch(p);
+            realBand=band;
             if(i==1)
             {
-                    x>>=1;y>>=1;w>>=1;h>>=1;
+                    x>>=1;y>>=1;w>>=1;h>>=1;realBand>>=1;
             }
             if(x+w>=width) w=width-x-1;
             if(y+h>=height) h=height-y-1;
-
+            if(realBand*2>w) realBand=w/2; // avoid overlap
+            if(realBand*2>h) realBand=w/h;
+            //printf("Plane = %d, w=%d h = %d, x=%d y=%d, band=%d\n",i,w,h,x,y,realBand) ;
             xdelogo(img->GetWritePtr(p), img->GetReadPtr(p),
-                stride,stride,width,height,
-                x,y,w,h, band, show, true);
+                stride,stride,
+                width,height,
+                x,y,w,h, realBand, show, true);
 
         }
     return true;

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/CMakeLists.txt -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/CMakeLists.txt Changed

@@ -7,16 +7,26 @@
         TARGET_LINK_LIBRARIES(${tgt} ADM_libavutil)
 ENDMACRO(addDeps tgt)
 
+IF(DO_QT4)
+    IF(ADM_QT_VERSION EQUAL 4)
+        SET(QT_TAG qt4)
+    ELSE(ADM_QT_VERSION EQUAL 4)
+        SET(QT_TAG qt5)
+        ADM_QT_ADD_RESOURCES(resource   qt5/delogo.qrc)
+    ENDIF(ADM_QT_VERSION EQUAL 4)
+ENDIF(DO_QT4)
+
+
 SET(mpdelogoCommon_SRCS 
 ADM_vidMPdelogo.cpp
 )
 # ---------- QT4 Version ----------------
 INCLUDE(vf_plugin_qt4)
-SET(mpdelogoQT_SRCS  qt4/Q_mpdelogo.cpp )
-SET(mpdelogoQT_HEADERS  qt4/Q_mpdelogo.h)
-SET(mpdelogoQT_UI    qt4/mpdelogo)
+SET(mpdelogoQT_SRCS  ${QT_TAG}/Q_mpdelogo.cpp )
+SET(mpdelogoQT_HEADERS  ${QT_TAG}/Q_mpdelogo.h)
+SET(mpdelogoQT_UI    ${QT_TAG}/mpdelogo)
 IF(DO_QT4)
-  INIT_VIDEO_FILTER_QT4(ADM_vf_mpdelogo${QT_LIBRARY_EXTENSION} ${mpdelogoQT_SRCS} ${mpdelogoQT_HEADERS} ${mpdelogoQT_UI} ${mpdelogoCommon_SRCS} qt4/DIA_flyMpDelogo.cpp)
+  INIT_VIDEO_FILTER_QT4(ADM_vf_mpdelogo${QT_LIBRARY_EXTENSION} ${mpdelogoQT_SRCS} ${mpdelogoQT_HEADERS} ${mpdelogoQT_UI} ${mpdelogoCommon_SRCS} ${QT_TAG}/DIA_flyMpDelogo.cpp ${resource})
   addDeps(ADM_vf_mpdelogo${QT_LIBRARY_EXTENSION})
 ENDIF(DO_QT4)
 # /QT4

avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5 Added

avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.cpp Added

@@ -0,0 +1,389 @@
+/**/
+/***************************************************************************
+                          DIA_flyMpDelogo
+                             -------------------
+
+                           Ui for MPlayer DeLogo filter
+
+    begin                : 08 Apr 2005
+    copyright            : (C) 2004/5 by mean
+    email                : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#include "DIA_flyDialogQt4.h"
+#include "QRubberBand"
+#include "QSizeGrip"
+#include "QHBoxLayout"
+#include "ADM_default.h"
+#include "ADM_image.h"
+
+
+#include "delogo.h"
+#include "DIA_flyMpDelogo.h"
+#include "ADM_vidMPdelogo.h"
+#include "Q_mpdelogo.h"
+#include "ADM_toolkitQt.h"
+
+
+#if 0
+#define aprintf ADM_info
+#else
+#define aprintf(...) {}
+#endif
+
+
+/**
+ * 
+ * @param parent
+ * @param width
+ * @param height
+ * @param in
+ * @param canvas
+ * @param slider
+ */
+ flyMpDelogo::flyMpDelogo (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
+                                    ADM_QCanvas *canvas, QSlider *slider) : 
+                ADM_flyDialogYuv(parent,width, height,in,canvas, slider,RESIZE_AUTO) 
+ {
+    rubber=new Resizable_rubber_band(this,canvas);
+    rubber->resize(width,height);
+ }
+ /**
+  * 
+  */
+flyMpDelogo::~flyMpDelogo()
+{
+    if(rubber)
+    {
+        delete rubber;
+        rubber=NULL;
+    }
+}
+/**
+ * \fn bandResized
+ * @param w
+ * @param h
+ * @return 
+ */
+bool    flyMpDelogo::bandResized(int x,int y,int w, int h)
+{
+    aprintf("BandResized\n");        
+    int nw,nh,nx,ny;
+    
+    delogo newParam;
+    
+    double halfzoom=_zoom/2-0.01;
+    
+    newParam.lw=((double)w+halfzoom)/_zoom;
+    newParam.lh=((double)h+halfzoom)/_zoom;
+    newParam.xoff=((double)x+halfzoom)/_zoom;
+    newParam.yoff=((double)y+halfzoom)/_zoom;
+    
+    aprintf("%d x %d => %d x %d, %f\n",param.lw,param.lh,newParam.lw,newParam.lh,_zoom);
+    
+    param.lw=newParam.lw;
+    param.lh=newParam.lh;
+    param.xoff=newParam.xoff;
+    param.yoff=newParam.yoff;
+    
+    upload(false);
+    //
+    return true;
+}
+
+
+/************* COMMON PART *********************/
+/**
+    \fn process
+*/
+uint8_t    flyMpDelogo::processYuv(ADMImage* in, ADMImage *out)
+{
+    out->duplicate(in);
+    if(preview)
+        MPDelogo::doDelogo(out, param.xoff, param.yoff,
+                             param.lw,  param.lh,param.band,param.show);        
+    else
+    {
+        rubber->move(_zoom*(float)param.xoff,_zoom*(float)param.yoff);
+        rubber->resize(_zoom*(float)param.lw,_zoom*(float)param.lh);
+    }
+    return 1;
+}
+/**
+        \fn Ctor
+*/
+Resizable_rubber_band::Resizable_rubber_band(flyMpDelogo *fly,QWidget *parent) : QWidget(parent) 
+{
+  nestedIgnore=0;
+  flyParent=fly;
+  //tell QSizeGrip to resize this widget instead of top-level window
+  setWindowFlags(Qt::SubWindow);
+  QHBoxLayout* layout = new QHBoxLayout(this);
+  layout->setContentsMargins(0, 0, 0, 0);
+  QSizeGrip* grip1 = new QSizeGrip(this);
+  QSizeGrip* grip2 = new QSizeGrip(this);
+  grip1->setVisible(true);
+  grip2->setVisible(true);
+  layout->addWidget(grip1, 0, Qt::AlignLeft | Qt::AlignTop);
+  layout->addWidget(grip2, 0, Qt::AlignRight | Qt::AlignBottom);
+  rubberband = new QRubberBand(QRubberBand::Rectangle, this);
+  QPalette pal;
+  pal.setBrush(QPalette::Highlight, QBrush(Qt::red,Qt::DiagCrossPattern));
+  rubberband->setPalette(pal);
+  rubberband->setForegroundRole(QPalette::Highlight);
+  rubberband->move(0, 0);
+  rubberband->show();
+  show();
+}
+/**
+        \fn resizeEvent
+*/
+void Resizable_rubber_band::resizeEvent(QResizeEvent *) 
+{
+  int x,y,w,h;
+  x=pos().x();
+  y=pos().y();
+  w=size().width();
+  h=size().height();
+  aprintf("Resize event : %d x %d , %d x %d\n",x,y,w,h);
+  rubberband->resize(size());
+  if(!nestedIgnore)
+    flyParent->bandResized(pos().x(),pos().y(),size().width(),size().height());
+}
+
+/**
+    \fn ctor
+*/
+
+  Ui_mpdelogoWindow::Ui_mpdelogoWindow(QWidget *parent,  delogo *param, ADM_coreVideoFilter *in) 
+            : QDialog(parent)
+  {
+    static bool doOnce=false;
+    uint32_t width,height;
+        
+        aprintf("Ctor @ %d: %d, %d x %d\n",param->xoff, param->yoff, param->lw,param->lh);
+        
+        ui.setupUi(this);
+        _in=in;
+        
+        lock=0;
+        // Allocate space for green-ised video
+        width=in->getInfo()->width;
+        height=in->getInfo()->height;
+
+        canvas=new ADM_QCanvas(ui.graphicsView,width,height);        
+        myCrop=new flyMpDelogo(this, width, height,in,canvas,ui.horizontalSlider);
+        myCrop->param=*param;
+        myCrop->_cookie=&ui;
+        myCrop->addControl(ui.toolboxLayout);
+        myCrop->setPreview(false);
+#define SPINENTRY(x) ui.x
+        SPINENTRY(spinX)->setMaximum(width);
+        SPINENTRY(spinW)->setMaximum(width);
+        SPINENTRY(spinY)->setMaximum(height);
+        SPINENTRY(spinH)->setMaximum(height);
+
+        SPINENTRY(spinX)->setSingleStep(5);
+        SPINENTRY(spinY)->setSingleStep(5);
+        SPINENTRY(spinW)->setSingleStep(5);
+        SPINENTRY(spinH)->setSingleStep(5);
+        aprintf("Uploading\n");
+        myCrop->upload();

avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/DIA_flyMpDelogo.h Added

@@ -0,0 +1,82 @@
+/***************************************************************************
+    copyright            : (C) 2011 by mean
+    email                : fixounet@free.fr
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#pragma once
+
+/**
+    \class flyASharp
+*/
+#include "delogo.h"
+class QRubberBand;
+class flyMpDelogo;
+/**
+        \class Resizable_rubber_band
+        \brief http://stackoverflow.com/questions/19066804/implementing-resize-handles-on-qrubberband-is-qsizegrip-relevant
+*/
+class Resizable_rubber_band : public QWidget 
+{
+public:
+  flyMpDelogo     *flyParent;
+  Resizable_rubber_band(flyMpDelogo *fly,QWidget* parent = 0);
+  int               nestedIgnore;
+
+public:
+  QRubberBand* rubberband;
+  void resizeEvent(QResizeEvent *);
+  void blockSignals(bool sig)
+  {
+      rubberband->blockSignals(sig);
+  }
+  
+#if 0
+  void update()
+  {
+    rubberband->update();
+  }
+#endif
+};
+
+/**
+    \class flyMpDelogo
+*/
+class flyMpDelogo : public ADM_flyDialogYuv
+{
+protected:
+    bool    blockChanges(bool block)  ;
+public:
+   delogo      param;
+   bool        preview;
+   Resizable_rubber_band *rubber;
+public:
+   uint8_t     processYuv(ADMImage* in, ADMImage *out);
+   uint8_t     download(void);
+   uint8_t     upload() {return upload(true);}
+   uint8_t     upload(bool update);
+               flyMpDelogo (QDialog *parent,uint32_t width,uint32_t height,ADM_coreVideoFilter *in,
+                                    ADM_QCanvas *canvas, QSlider *slider);
+                
+   virtual     ~flyMpDelogo() ;
+   bool         setXy(int x,int y);
+   bool         setPreview(bool onoff)
+                {
+                    preview=onoff;
+                    if(preview)
+                      rubber->hide();
+                    else
+                      rubber->show();
+                    return true;
+                }
+    bool    bandResized(int x,int y,int w, int h);
+    void    autoZoom(bool state);
+};
+// EOF

avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/Q_mpdelogo.cpp Added

avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/Q_mpdelogo.h Added

avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/delogo.qrc Added

avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/grips.png Added

avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/mplayerDelogo/qt5/mpdelogo.ui Added

@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>mpdelogoDialog</class>
+ <widget class="QDialog" name="mpdelogoDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>507</width>
+    <height>488</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Mplayer Delogo</string>
+  </property>
+  <layout class="QFormLayout" name="formLayout">
+   <item row="2" column="0">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0">
+    <layout class="QVBoxLayout" name="verticalLayout"/>
+   </item>
+   <item row="1" column="0" colspan="2">
+    <layout class="QVBoxLayout" name="verticalLayout_2">
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout">
+       <item>
+        <layout class="QGridLayout" name="gridLayout">
+         <item row="1" column="4">
+          <widget class="QLabel" name="label_6">
+           <property name="text">
+            <string/>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="0">
+          <widget class="QLabel" name="label">
+           <property name="text">
+            <string>X</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="QSpinBox" name="spinX"/>
+         </item>
+         <item row="0" column="3">
+          <widget class="QSpinBox" name="spinW"/>
+         </item>
+         <item row="0" column="4">
+          <widget class="QLabel" name="label_5">
+           <property name="text">
+            <string>Border Width</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="2">
+          <widget class="QLabel" name="label_3">
+           <property name="text">
+            <string>Width</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="2">
+          <widget class="QLabel" name="label_4">
+           <property name="text">
+            <string>Height</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="3">
+          <widget class="QSpinBox" name="spinH"/>
+         </item>
+         <item row="1" column="0">
+          <widget class="QLabel" name="label_2">
+           <property name="text">
+            <string>Y</string>
+           </property>
+           <property name="textFormat">
+            <enum>Qt::PlainText</enum>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <widget class="QSpinBox" name="spinY"/>
+         </item>
+         <item row="0" column="5">
+          <widget class="QSpinBox" name="spinBand"/>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_3">
+       <item>
+        <widget class="QLabel" name="label_7">
+         <property name="text">
+          <string>You can resize the red rectangle using the grips </string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="labelHelp">
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="toolboxLayout">
+       <property name="leftMargin">
+        <number>3</number>
+       </property>
+       <property name="topMargin">
+        <number>5</number>
+       </property>
+       <property name="rightMargin">
+        <number>9</number>
+       </property>
+       <property name="bottomMargin">
+        <number>11</number>
+       </property>
+      </layout>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_2"/>
+     </item>
+     <item>
+      <widget class="QSlider" name="horizontalSlider">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QGraphicsView" name="graphicsView"/>
+     </item>
+     <item>
+      <widget class="QCheckBox" name="checkBoxPreview">
+       <property name="text">
+        <string>Preview</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <tabstops>
+  <tabstop>spinX</tabstop>
+  <tabstop>spinW</tabstop>
+  <tabstop>spinY</tabstop>
+  <tabstop>spinH</tabstop>
+  <tabstop>spinBand</tabstop>
+  <tabstop>horizontalSlider</tabstop>
+  <tabstop>graphicsView</tabstop>
+  <tabstop>checkBoxPreview</tabstop>
+ </tabstops>
+ <resources>
+  <include location="delogo.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/resampleFps/ADM_vidResampleFPS.cpp Changed

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/rotate/rotate.cpp Changed

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6/telecide/Telecide_utils.cpp Changed

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/glBenchmark/benchGl.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/glBenchmark/benchGl.cpp Changed

@@ -73,25 +73,11 @@
     _parentQGL->makeCurrent();
     fboY->bind();
     ADM_info("Compiling shader \n");
-    glProgramY = new QGLShaderProgram(_context);
-    ADM_assert(glProgramY);
-    if ( !glProgramY->addShaderFromSourceCode(QGLShader::Fragment, myShaderY))
+    glProgramY =    createShaderFromSource(QGLShader::Fragment,myShaderY);
+    if(!glProgramY)
     {
-            ADM_error("[GL Render] Fragment log: %s\n", glProgramY->log().toUtf8().constData());
-            ADM_assert(0);
+        ADM_error("Cannot setup shader\n");
     }
-    if ( !glProgramY->link())
-    {
-        ADM_error("[GL Render] Link log: %s\n", glProgramY->log().toUtf8().constData());
-        ADM_assert(0);
-    }
-
-    if ( !glProgramY->bind())
-    {
-            ADM_error("[GL Render] Binding FAILED\n");
-            ADM_assert(0);
-    }
-
     fboY->release();
     _parentQGL->doneCurrent();
 
@@ -111,6 +97,15 @@
 */
 bool openGlBenchmark::getNextFrame(uint32_t *fn,ADMImage *image)
 {
+    char str1[81];
+    char str2[81];
+
+    if(!glProgramY)
+    {
+        snprintf(str1,80,"Shader was not compiled succesfully");
+        image->printString(2,4,str1); 
+        return true;
+    }
     // since we do nothing, just get the output of previous filter
     if(false==previousFilter->getNextFrame(fn,image))
     {
@@ -160,8 +155,6 @@
     bench.getResultUs(avg1,min1,max1);
     bench2.getResultUs(avg2,min2,max2);
 
-    char str1[81];
-    char str2[81];
 
     snprintf(str1,80,"Qt  avg=%03.2f us, min=%d max=%d us",avg1,(int)min1,(int)max1);
     snprintf(str2,80,"DMA avg=%03.2f us, min=%d max=%d us",avg2,(int)min2,(int)max2);

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/glResize/sampleGl.cpp Changed

@@ -88,23 +88,10 @@
         _parentQGL->makeCurrent();
         fboY->bind();
         printf("Compiling shader \n");
-        glProgramY = new QGLShaderProgram(_context);
-        ADM_assert(glProgramY);
-        if ( !glProgramY->addShaderFromSourceCode(QGLShader::Fragment, myShaderY))
+        glProgramY =    createShaderFromSource(QGLShader::Fragment,myShaderY);
+        if ( !glProgramY)
         {
-                ADM_error("[GL Render] Fragment log: %s\n", glProgramY->log().toUtf8().constData());
-                ADM_assert(0);
-        }
-        if ( !glProgramY->link())
-        {
-            ADM_error("[GL Render] Link log: %s\n", glProgramY->log().toUtf8().constData());
-            ADM_assert(0);
-        }
-
-        if ( !glProgramY->bind())
-        {
-                ADM_error("[GL Render] Binding FAILED\n");
-                ADM_assert(0);
+            ADM_error("[GL Render] Cannot compile shader\n");            
         }
 
         fboY->release();
@@ -127,6 +114,15 @@
 */
 bool openGlResize::getNextFrame(uint32_t *fn,ADMImage *image)
 {
+    if(!glProgramY)
+    {
+        char strxx[80];
+        snprintf(strxx,80,"Shader was not compiled succesfully");
+        image->printString(2,4,strxx); 
+        return true;
+    }    
+    
+    
     // since we do nothing, just get the output of previous filter
     if(false==previousFilter->getNextFrame(fn,original))
     {

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/glRotate/rotateGl.cpp Changed

@@ -75,24 +75,13 @@
         _parentQGL->makeCurrent();
         fboY->bind();
         printf("Compiling shader \n");
-        glProgramY = new QGLShaderProgram(_context);
-        ADM_assert(glProgramY);
-        if ( !glProgramY->addShaderFromSourceCode(QGLShader::Fragment, myShaderY))
+        
+        glProgramY =    createShaderFromSource(QGLShader::Fragment,myShaderY);
+        if(!glProgramY)
         {
-                ADM_error("[GL Render] Fragment log: %s\n", glProgramY->log().toUtf8().constData());
-                ADM_assert(0);
-        }
-        if ( !glProgramY->link())
-        {
-            ADM_error("[GL Render] Link log: %s\n", glProgramY->log().toUtf8().constData());
-            ADM_assert(0);
-        }
-
-        if ( !glProgramY->bind())
-        {
-                ADM_error("[GL Render] Binding FAILED\n");
-                ADM_assert(0);
-        }
+            ADM_error("Cannot setup shader\n");
+        }        
+                
         glList=glGenLists(1);
         genQuad();
         fboY->release();
@@ -116,6 +105,15 @@
 */
 bool rotateGl::getNextFrame(uint32_t *fn,ADMImage *image)
 {
+    if(!glProgramY)
+    {
+        char strxx[80];
+        snprintf(strxx,80,"Shader was not compiled succesfully");
+        image->printString(2,4,strxx); 
+        return true;
+    }    
+    
+    
     // since we do nothing, just get the output of previous filter
     if(false==previousFilter->getNextFrame(fn,original))
     {

avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/passthrough.shader Added

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shader.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shader.cpp Changed

@@ -25,6 +25,7 @@
 #include "DIA_factory.h"
 #include "shaderLoader.h"
 #include "shaderLoader_desc.cpp"
+#include "DIA_coreToolkit.h"
 /**
     \class shaderLoader
 */
@@ -40,6 +41,9 @@
 
 protected:
                 bool        render(ADMImage *image,ADM_PLANE plane,QGLFramebufferObject *fbo);
+                bool        loadShader(const char *src);
+                bool        reload( void);
+    static      void        cb(void *c);
 public:
                              shaderLoader(ADM_coreVideoFilter *previous,CONFcouple *conf);
                             ~shaderLoader();
@@ -61,7 +65,56 @@
                         QT_TRANSLATE_NOOP("glShader","Run an external shader program.") // Description
                     );
 
-// Now implements the interesting parts
+
+/**
+ * \fn loadShader
+ * @param src
+ * @return 
+ */
+bool shaderLoader::loadShader(const char *src)
+{
+    
+    if(!ADM_fileExist(src))
+    {
+        ADM_warning("Shader file does not exist (%s)\n",src);
+        return false;
+    }
+    
+    int sourceSize=ADM_fileSize(src);
+    if(sourceSize<5)
+    {
+        ADM_warning("Shader file is too short(%s)\n",src);
+        return false;
+    }
+    
+    uint8_t *buffer=(uint8_t *)admAlloca(sourceSize+1);
+    FILE *f=fopen(params.shaderFile.c_str(),"rt");
+    if(!f)
+    {
+        ADM_warning("Cannot open file %s\n",src);
+        return false;
+    }
+        
+    fread(buffer,sourceSize,1,f);
+    buffer[sourceSize]=0;
+    fclose(f);
+    f=NULL;
+
+    if(glProgramY)
+    {
+        delete glProgramY;
+        glProgramY=NULL;
+    }
+    glProgramY =    createShaderFromSource(QGLShader::Fragment,(char *)buffer);
+    if(!glProgramY)
+    {
+        ADM_error("Shader compiling failed\n");
+        return false;
+    }
+    ADM_info("Shader %s successfully loaded an compiled\n",src);
+    return true;
+}
+
 /**
     \fn shaderLoader
     \brief constructor
@@ -75,62 +128,13 @@
         original=new ADMImageDefault(in->getInfo()->width,in->getInfo()->height);
         _parentQGL->makeCurrent();
         fboY->bind();
-        ready=true;
+        ready=false;
 
-        printf("Compiling shader \n");
-        glProgramY = new QGLShaderProgram(_context);
-        ADM_assert(glProgramY);
+        ADM_info("Compiling shader %s \n",params.shaderFile.c_str());
 
         // Load the file info memory
-        int sourceSize=-1;
-        if(ADM_fileExist(params.shaderFile.c_str()))
-        {
-            sourceSize=ADM_fileSize(params.shaderFile.c_str());
-        }else
-        {
-            ADM_warning("Shader file does not exist (%s)\n",params.shaderFile.c_str());
-            ready=false;
-        }
-        if(sourceSize<5)
-        {
-            ADM_warning("File too short, needs to be at least 5 chars\n");
-            ready=false;
-        }
-        if(ready)
-        {
-            uint8_t *buffer=(uint8_t *)admAlloca(sourceSize+1);
-            FILE *f=fopen(params.shaderFile.c_str(),"rt");
-            if(f)
-            {
-                fread(buffer,sourceSize,1,f);
-                buffer[sourceSize]=0;
-                fclose(f);
-                if ( !glProgramY->addShaderFromSourceCode(QGLShader::Fragment,(char *) buffer))
-                {
-                    ready=false;
-                    erString="Compiling shader failed"+std::string(glProgramY->log().toUtf8().constData());
-                    ADM_warning("Compilation failed (size=%d)\n",sourceSize);
-                }
-            }else
-            {
-                ADM_warning("Cannot open file %s\n",params.shaderFile.c_str());
-                erString=std::string("Cannot open file");
-                ready=false;
-            }
-        }
-        if ( ready && !glProgramY->link())
-        {
-            ready=false;
-            erString=std::string( glProgramY->log().toUtf8().constData());
-            ADM_warning("Link failed\n");
-        }
-
-        if ( ready && ! glProgramY->bind())
-        {
-                ready=false;
-                erString=std::string("OpenGl bind failed");
-                ADM_warning("Bind failed\n");
-        }
+        ready=loadShader(params.shaderFile.c_str());
+        
         glList=glGenLists(1);
         genQuad();
         fboY->release();
@@ -217,17 +221,51 @@
     return st;
 }
 
+void shaderLoader::cb(void *c)
+{
+    shaderLoader *sl=(shaderLoader *)c;
+    sl->ready=sl->reload();
+}
+/**
+ * 
+ * @return 
+ */
+bool shaderLoader::reload( void)
+{
+        _parentQGL->makeCurrent();
+        fboY->bind();
+        ADM_info("Compiling shader %s \n",params.shaderFile.c_str());
+        // Load the file info memory
+        ready=loadShader(params.shaderFile.c_str());        
+        glList=glGenLists(1);
+        genQuad();
+        fboY->release();
+        _parentQGL->doneCurrent();
+        if(!ready)
+        {
+             GUI_Error_HIG (QT_TRANSLATE_NOOP("adm","Cannot compile shader"), NULL);
+             return false;
+        }
+        return true;
+}
 /**
     \fn configure
 */
 bool shaderLoader::configure( void)
 {
-    diaElemFile shader(0,params.shaderFile,QT_TRANSLATE_NOOP("glShader","ShaderFile to load"));
-    diaElem *elems[]={&shader};
-
+again:
+    diaElemFile shader(0,params.shaderFile,QT_TRANSLATE_NOOP("glShader","ShaderFile to load"));    
+    diaElemButton reloadButton(QT_TR_NOOP("Reload shader"),cb,this);
+    diaElem *elems[]={&shader,&reloadButton};
+    
      if(diaFactoryRun(QT_TRANSLATE_NOOP("glShader","ShaderLoader"),sizeof(elems)/sizeof(diaElem *),elems))
      {
-                return true;
+        ready=reload();
+        if(!ready)
+        {
+             goto again;
+        }
+        return true;                
      }
      return false;
 }

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shaders/bump.shader -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shaders/bump.shader Changed

@@ -4,21 +4,24 @@
 uniform sampler2DRect myTextureV; // tex unit 2
 uniform float pts; // time in us
 uniform vec2  myResolution; // 
-const vec2 half_vec=vec2(0.5,0.5);
+const vec2 haalf_vec=vec2(0.5,0.5);
 const float PI = 3.1415926535;
  
 void main()
 {
   float aperture = 178.0;
-  float apertureHalf = 0.5 * aperture * (PI / 180.0);
-  float maxFactor = sin(apertureHalf)*3*cos((pts/3000000.)*PI);
-  if(maxFactor<0)
+  float aperturehaalf = 0.5 * aperture * (PI / 180.0);
+  float maxFactor = sin(aperturehaalf)*3.*cos((pts/3000000.)*PI);
+  if(maxFactor<0.)
   {
-               maxFactor=-maxFactor; // fabs ? 
+               maxFactor=-1.*maxFactor; // fabs ? 
   }
   
   vec2 uv;
-  vec2 xy =  2*gl_TexCoord[0].xy /myResolution -vec2(1.,1.);
+  vec2 xy;
+  vec2 mul2=vec2(2.0,2.0);
+  xy =  mul2*gl_TexCoord[0].xy;
+  xy=xy/myResolution -vec2(1.,1.);
   float d = length(xy);
   if (d < (2.0-maxFactor))
   {
@@ -36,8 +39,8 @@
     uv = gl_TexCoord[0].xy ;
   }
   vec4 cY = texture2DRect(myTextureY, uv);
-  vec4 cU = texture2DRect(myTextureU, uv*half_vec);
-  vec4 cV = texture2DRect(myTextureV, uv*half_vec);
+  vec4 cU = texture2DRect(myTextureU, uv*haalf_vec);
+  vec4 cV = texture2DRect(myTextureV, uv*haalf_vec);
   gl_FragColor = vec4(cY.r,cU.r,cV.r,1.0);
 }

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shaders/lightning.shader -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shaders/lightning.shader Changed

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shaders/ripple.shader -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shaders/ripple.shader Changed

@@ -5,15 +5,15 @@
 uniform sampler2DRect myTextureV; // tex unit 2
 uniform vec2  myResolution;
 uniform float pts; // tex unit 2
-const vec2 half_vec=vec2(0.5,0.5);
+const vec2 haalf_vec=vec2(0.5,0.5);
 void main() 
 { 
-  vec3 shockParams=vec3( 10.0, 0.8, myResolution.x/50); // 1- pow base, 2 - pow exponent 3- Size of the wave
+  vec3 shockParams=vec3( 10.0, 0.8, myResolution.x/50.); // 1- pow base, 2 - pow exponent 3- Size of the wave
 
   vec2 pos=gl_TexCoord[0].xy;
   vec2 texCoord = pos;
 
-  float distance = distance(pos, myResolution*half_vec);
+  float distance = distance(pos, myResolution*haalf_vec);
 
   float time=pts/3000.;
 
@@ -24,13 +24,13 @@
     float powDiff = 1.0 - pow(abs(diff*shockParams.x), 
                                 shockParams.y); 
     float diffTime = diff  * powDiff; 
-    vec2 diffUV = normalize(pos - myResolution*half_vec); 
+    vec2 diffUV = normalize(pos - myResolution*haalf_vec); 
     texCoord = pos + (diffUV * diffTime);
   } 
 
-  vec3 cY = texture2DRect(myTextureY, texCoord);
-  vec3 cU = texture2DRect(myTextureU, texCoord*half_vec);
-  vec3 cV = texture2DRect(myTextureV, texCoord*half_vec);
+  vec4 cY = texture2DRect(myTextureY, texCoord);
+  vec4 cU = texture2DRect(myTextureU, texCoord*haalf_vec);
+  vec4 cV = texture2DRect(myTextureV, texCoord*haalf_vec);
 
   gl_FragColor = vec4(cY.r,cU.r,cV.r,1.0);
 }

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shaders/zigzag.shader -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/shaders/zigzag.shader Changed

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/zigzag.shader -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/glShaderLoader/zigzag.shader Changed

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/sample_distort/sampleGl.cpp Changed

@@ -74,24 +74,12 @@
         // vertex shader 
        
         // frag shader
-        glProgramY = new QGLShaderProgram(_context);
-        ADM_assert(glProgramY);
-        if ( !glProgramY->addShaderFromSourceCode(QGLShader::Fragment, myShaderY))
+        glProgramY =    createShaderFromSource(QGLShader::Fragment,myShaderY);
+        if(!glProgramY)
         {
-                ADM_error("[GL Render] Fragment log: %s\n", glProgramY->log().toUtf8().constData());
-                ADM_assert(0);
-        }
-        if ( !glProgramY->link())
-        {
-            ADM_error("[GL Render] Link log: %s\n", glProgramY->log().toUtf8().constData());
-            ADM_assert(0);
-        }
+            ADM_error("Cannot setup shader\n");
+        }        
 
-        if ( !glProgramY->bind())
-        {
-                ADM_error("[GL Render] Binding FAILED\n");
-                ADM_assert(0);
-        }
         glList=glGenLists(1);
         
         fboY->release();
@@ -113,6 +101,13 @@
 */
 bool openGlDistort::getNextFrame(uint32_t *fn,ADMImage *image)
 {
+    if(!glProgramY)
+    {
+        char strxx[80];
+        snprintf(strxx,80,"Shader was not compiled succesfully");
+        image->printString(2,4,strxx); 
+        return true;
+    }
     // since we do nothing, just get the output of previous filter
     if(false==previousFilter->getNextFrame(fn,image))
     {

avidemux_2.6.18.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.cpp -> avidemux_2.6.19.tar.gz/avidemux_plugins/ADM_videoFilters6_openGl/sample_fragment2/sampleGl.cpp Changed

@@ -78,25 +78,12 @@
         _parentQGL->makeCurrent();
         fboY->bind();
         printf("Compiling shader \n");
-        glProgramY = new QGLShaderProgram(_context);
-        ADM_assert(glProgramY);
-        if ( !glProgramY->addShaderFromSourceCode(QGLShader::Fragment, myShaderY))
+        glProgramY =    createShaderFromSource(QGLShader::Fragment,myShaderY);
+        if(!glProgramY)
         {
-                ADM_error("[GL Render] Fragment log: %s\n", glProgramY->log().toUtf8().constData());
-                ADM_assert(0);
+            ADM_error("Cannot setup shader\n");
         }
-        if ( !glProgramY->link())
-        {
-            ADM_error("[GL Render] Link log: %s\n", glProgramY->log().toUtf8().constData());
-            ADM_assert(0);
-        }
-
-        if ( !glProgramY->bind())
-        {
-                ADM_error("[GL Render] Binding FAILED\n");
-                ADM_assert(0);
-        }
-
+        
         fboY->release();
         _parentQGL->doneCurrent();
 
@@ -116,6 +103,13 @@
 */
 bool openGlSample::getNextFrame(uint32_t *fn,ADMImage *image)
 {
+    if(!glProgramY)
+    {
+        char strxx[80];
+        snprintf(strxx,80,"Shader was not compiled succesfully");
+        image->printString(2,4,strxx); 
+        return true;
+    }
     // since we do nothing, just get the output of previous filter
     if(false==previousFilter->getNextFrame(fn,image))
     {

avidemux_2.6.18.tar.gz/avidemux_plugins/CMakeLists.txt -> avidemux_2.6.19.tar.gz/avidemux_plugins/CMakeLists.txt Changed

@@ -211,23 +211,23 @@
     checkQt()
     IF (NOT QT_FOUND)
         SET(DO_QT4 0)
-        MESSAGE("ERROR QT4 UI requested, but qt4 libraries not found... disabling it")
+        MESSAGE("ERROR QT4 type UI requested, but Qt libraries not found... disabling it")
 		MESSAGE("")
     ELSE (NOT QT_FOUND)
-        MESSAGE(STATUS "QT4 libraries found, good")
+        MESSAGE(STATUS "Qt libraries found, good")
         CHECK_ADM_CONFIG_H(${QT_EXTENSION} ADM_INC)
 		MESSAGE("")
 
         INCLUDE(admCheckOpenGl)
         IF(NOT ADM_INC)
-            MESSAGE("ERROR QT4 UI requested, but cannot find header file for avidemux/qt4...disabling it")
+            MESSAGE("ERROR QT4 type UI requested, but cannot find header files from avidemux/qt4... disabling it")
 			MESSAGE("")
             SET(DO_QT4 0)
         ENDIF(NOT ADM_INC)
     ENDIF (NOT QT_FOUND)
 endif(DO_QT4)
 
-APPEND_SUMMARY_LIST("User Interface" "Qt 4" "${DO_QT4}")
+APPEND_SUMMARY_LIST("User Interface" "Qt" "${DO_QT4}")
 
 #*****
 # CLI
@@ -239,7 +239,7 @@
         CHECK_ADM_CONFIG_H(cli ADM_INC)
 
         IF(NOT ADM_INC)
-            MESSAGE("ERROR CLI UI requested, but cannot find header file for avidemux/cli...disabling it")
+            MESSAGE("ERROR CLI type UI requested, but cannot find header files from avidemux/cli... disabling it")
             SET(DO_CLI 0)
         ENDIF(NOT ADM_INC)

avidemux_2.6.18.tar.gz/bootStrap.bash -> avidemux_2.6.19.tar.gz/bootStrap.bash Changed

@@ -8,7 +8,7 @@
 rebuild=0
 do_core=1
 do_cli=1
-do_qt4=1
+do_qt=1
 do_plugins=1
 do_asan=0
 debug=0
@@ -92,7 +92,7 @@
         else echo   "Release build"
         fi
         printModule $do_core Core
-        printModule $do_qt4 ${qt_ext}
+        printModule $do_qt ${qt_ext}
         printModule $do_cli Cli
         printModule $do_plugins Plugins
 }
@@ -107,15 +107,15 @@
         echo "  --tgz                 : Create tgz packages"
         echo "  --debug               : Switch debugging on"
         echo "  --rebuild             : Preserve existing build directories"
-        echo "  --with-core           : Build core"
+        echo "  --with-core           : Build core (default)"
         echo "  --without-core        : Don't build core"
-        echo "  --with-cli            : Build cli"
+        echo "  --with-cli            : Build cli (default)"
         echo "  --without-cli         : Don't build cli"
-        echo "  --with-core           : Build core"
-        echo "  --without-qt4         : Don't build qt4"
-        echo "  --with-plugins        : Build plugins"
+        echo "  --with-qt             : Build Qt dependent components (default)"
+        echo "  --without-qt          : Don't build Qt dependent components"
+        echo "  --with-plugins        : Build plugins (default)"
         echo "  --without-plugins     : Don't build plugins"
-        echo "  --enable-qt4          : Try to use qt4 instead of qt5"
+        echo "  --enable-qt4          : Try to use Qt4 instead of Qt5"
         echo "  --enable-asan         : Enable Clang/llvm address sanitizer"
         echo "  --with-clang          : Use clang/clang++ as compiler"
         echo "  --with-system-libass  : Use system libass instead of the bundled one"
@@ -200,8 +200,8 @@
          --with-clang)
                 export COMPILER="-DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++"
                 ;;
-         --without-qt4)
-                do_qt4=0
+         --without-qt)
+                do_qt=0
              ;;
          --without-cli)
                 do_cli=0
@@ -220,8 +220,8 @@
          --enable-asan)
                 do_asan=1
              ;;
-         --with-qt4)
-                do_qt4=1
+         --with-qt)
+                do_qt=1
              ;;
          --with-cli)
                 do_cli=1
@@ -292,7 +292,7 @@
         echo " Installing core"
         cd $TOP/buildCore${POSTFIX} 
 fi
-if [ "x$do_qt4" = "x1" ] ; then 
+if [ "x$do_qt" = "x1" ] ; then
         echo "** $qt_ext **"
         cd $TOP
         Process build${qt_ext} ../avidemux/qt4
@@ -311,7 +311,7 @@
         cd $TOP
         Process buildPluginsCommon ../avidemux_plugins "-DPLUGIN_UI=COMMON $EXTRA_CMAKE_DEFS"
 fi
-if [ "x$do_plugins" = "x1" -a "x$do_qt4" = "x1" ] ; then 
+if [ "x$do_plugins" = "x1" -a "x$do_qt" = "x1" ] ; then
         echo "** Plugins ${qt_ext} **"
         cd $TOP
         Process buildPlugins${qt_ext} ../avidemux_plugins "-DPLUGIN_UI=QT4 $EXTRA_CMAKE_DEFS"

avidemux_2.6.18.tar.gz/cmake/admFFmpegBuild_helpers.cmake -> avidemux_2.6.19.tar.gz/cmake/admFFmpegBuild_helpers.cmake Changed

avidemux_2.6.19.tar.gz/cmake/admFFmpegVersion.cmake Added

avidemux_2.6.18.tar.gz/cmake/avidemuxVersion.cmake -> avidemux_2.6.19.tar.gz/cmake/avidemuxVersion.cmake Changed

avidemux_2.6.18.tar.gz/createDebFromSourceUbuntu.bash -> avidemux_2.6.19.tar.gz/createDebFromSourceUbuntu.bash Changed

@@ -21,9 +21,9 @@
     echo "You will be asked to enter your password because installing build dependencies requires root permissions"
     # gcc, g++ and make get installed as dependencies of build-essential
     sudo apt-get update && sudo apt-get install build-essential cmake pkg-config yasm \
-    libsqlite3-dev libfontconfig1-dev libfribidi-dev libxv-dev libvdpau-dev libva-dev libpulse-dev \
+    libsqlite3-dev libfontconfig1-dev libfribidi-dev libxv-dev libvdpau-dev libva-dev libasound2-dev libpulse-dev \
     qttools5-dev-tools qtbase5-dev libqt5opengl5-dev \
-    libpng12-dev libaften-dev libmp3lame-dev libx264-dev libfaad-dev libfaac-dev libopus-dev libvorbis-dev libogg-dev libdca-dev \
+    libpng-dev libaften-dev libmp3lame-dev libx264-dev libxvidcore-dev libfaad-dev libfaac-dev libopus-dev libvorbis-dev libogg-dev libdca-dev \
     || { echo "The installation at least of some of the build dependencies failed. Aborting." && exit 2; }
     sudo apt-get install libx265-dev \
     || echo "Warning: libx265-dev cannot be installed using package management. Avidemux won't be able to encode in h265 unless the library and the headers have been installed manually. Continuing anyway." # there are no official libx265 packages for Ubuntu Trusty

Changes of Revision 36