~ubuntu-branches/ubuntu/karmic/avidemux/karmic-proposed

« back to all changes in this revision

Viewing changes to avidemux/ADM_video/ADM_vidColorYuv.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alessio Treglia
  • Date: 2009-02-17 23:41:46 UTC
  • mfrom: (1.1.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20090217234146-eakx254awuch4wgw
Tags: 1:2.4.4-0.0ubuntu1
* Merge from debian multimedia, Ubuntu remaining changes:
  - debian/control:
    + Build-Depends on newer libx264-dev.
    + Don't Build-Depends on ccache and libamrnb-dev.
    + Build-Depends on libpulse-dev.
    + Fixed small typo in avidemux description.
  - Don't use ccache.
  - Drop patch to fix build with newer x264, it has been merged by upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
162
162
            MKP(opt,0); 
163
163
       
164
164
            MKP(colorbars,0);
165
 
            MKP(analyze,1);
166
 
            MKP(autowhite,1); 
 
165
            MKP(analyze,0);
 
166
            MKP(autowhite,0); 
167
167
            MKP(autogain,0); 
168
168
 
169
169