← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/avidemux/jaunty

« back to all changes in this revision

Viewing changes to avidemux/ADM_encoder/adm_encConfig.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:
avidemux/ADM_encoder/adm_encConfig.cpp
918
918
        {
919
919
          printf ("Codec:%s\n", param->descriptor);
920
920
          printf ("Expected :%d got:%d\n", param->extraSettingsLen, extraLen);
921
 
          ADM_assert (0);
 
921
          //ADM_assert (0);
922
922
        }
923
923
      memcpy (param->extraSettings, extraData, param->extraSettingsLen);
924
924
    }