← Back to branch summary

~ubuntu-branches/ubuntu/lucid/avidemux/lucid

« back to all changes in this revision

Viewing changes to plugins/ADM_videoFilters/lavDeinterlace/ADM_lavpp_deint.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alessio Treglia
  • Date: 2009-08-20 08:42:44 UTC
  • mfrom: (1.1.14 upstream)
  • Revision ID: james.westby@ubuntu.com-20090820084244-bhh15xxd7x2vbcuh
Tags: 1:2.5.1+repack-0ubuntu1
https://launchpad.net/bugs/416066
* New upstream bugfix release (LP: #416066):
  - Re-enabled several video and audio encoders (regression introduced
    in 2.5.0)
  - Updated the FFmpeg libraries
  - More video encoders are now plugins
  - DV video encoder now supports more profiles
  - Fixed loading and saving issues with LAME, x264 and Xvid options
    (regression introduced in 2.5.0)
  - Fraps video decoding support
  - Lowpass-5 mode added to libavcodec deinterlacer filter plugin
  - Fixed formatting of parameters for various filters on 64-bit platforms
  - Updated libass
  - Fixed sizing of the bitrate control on various video encoder configure
    windows (regression introduced in 2.5.0)
  - Improved filter dialog for GTK+ interface
  - New navigation icons for GTK+ interface
  - Fixed the behaviour of several GTK+ open/save dialogs (regression
    introduced in 2.5.0)
  - asharp filter's Block Adaptive mode can now be disabled using the Qt
    interface
  - Re-enabled the colour chooser dialog using the Qt interface (regression
    introduced in 2.5.0)
  - GCC 4.4 support
  - Fixed issues with CMake build scripts when using multiple make jobs
    (regression introduced in 2.5.0)
* Remove debian/patches dir and drop all patches, now applied by upstream.
* Drop quilt support.
* debian/libavidemux0.install: Also install missing libraries.
* Move debian/install to debian/avidemux.install.
* debian/rules:
  - Build the internal ffmpeg version properly (thanks to Christian Marillat).
  - A bit of cleanup.
* debian/control:
  - Bump Standards-Version.
  - Update Homepage field.
  - Adjust libavidemux0 short description.
  - gtk -> GTK, qt -> QT.
  - Set myself as Maintainer.
* Repack the tarball to remove the debian/ dir provided by upstream:
  - Create debian/README.source.
  - Update debian/watch.
  - Add get-orig-source target to debian/rules.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/ADM_videoFilters/lavDeinterlace/ADM_lavpp_deint.cpp
103
103
  _in=in;
104
104
  
105
105
  
106
 
   diaMenuEntry menuField[6]={{PP_BM_NONE,        QT_TR_NOOP("None"),NULL},
 
106
   diaMenuEntry menuField[7]={{PP_BM_NONE,        QT_TR_NOOP("None"),NULL},
107
107
                             {PP_BM_LINEAR_BLEND, QT_TR_NOOP("Linear blend"),NULL},
108
108
                             {PP_BM_LINEAR_INTER, QT_TR_NOOP("Linear interpolate"),NULL},
109
109
                             {PP_BM_CUBIC_INTER, QT_TR_NOOP("Cubic interpolate"),NULL},
110
110
                             {PP_BM_MEDIAN_INTER, QT_TR_NOOP("Median interpolate"),NULL},
111
111
                             {PP_BM_FFMPEG_DEINT, QT_TR_NOOP("FFmpeg deint"),NULL},
 
112
                             {PP_BM_LOWPASS5_DEINT, QT_TR_NOOP("Lowpass5 deint"),NULL},
112
113
                          };
113
114
  
114
115
    
115
 
    diaElemMenu     menu1(PX(deintType),QT_TR_NOOP("_Deinterlacing:"), 6,menuField);
 
116
    diaElemMenu     menu1(PX(deintType),QT_TR_NOOP("_Deinterlacing:"), 7,menuField);
116
117
    diaElemToggle   autolevel(PX(autolevel),QT_TR_NOOP("_Autolevel"));
117
118
    
118
119
    diaElem *elems[2]={&menu1,&autolevel};
202
203
          case PP_BM_LINEAR_INTER: ADD(li);break;
203
204
          case PP_BM_CUBIC_INTER: ADD(ci);break;
204
205
          case PP_BM_MEDIAN_INTER: ADD(md);break;
205
 
          case PP_BM_FFMPEG_DEINT: ADD(fd);break;                             
 
206
          case PP_BM_FFMPEG_DEINT: ADD(fd);break;
 
207
          case PP_BM_LOWPASS5_DEINT: ADD(l5);break;
206
208
        }        
207
209
 
208
210