← Back to branch summary

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

« back to all changes in this revision

Viewing changes to avidemux/ADM_editor/ADM_edLoadSave.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_editor/ADM_edLoadSave.cpp
171
171
//___________________________
172
172
uint8_t  *extraData ;
173
173
uint32_t extraDataSize;
174
 
char *pth;
 
174
 
175
175
        qfprintf(fd,"\n//** Video Codec conf **\n");
176
176
        videoCodecGetConf(&extraDataSize,&extraData);
177
 
        
178
 
        pth= cleanupPath(name );
179
177
        qfprintf(fd,"app.video.codec(\"%s\",\"%s\",\"",videoCodecGetName(),videoCodecGetMode());
180
 
        ADM_dealloc(pth);
 
178
 
181
179
        // Now deal with extra data
182
180
        qfprintf(fd,"%d ",extraDataSize);
183
181
        if(extraDataSize)