← Back to branch summary

~ubuntu-branches/ubuntu/feisty/avidemux/feisty

« back to all changes in this revision

Viewing changes to avidemux/oplug_ogm/op_ogsavecopy.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Daniel T Chen
  • Date: 2006-12-15 17:13:20 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20061215171320-w79pvpehxx2fr217
Tags: 1:2.3.0-0.0ubuntu1
* Merge from debian-multimedia.org, remaining Ubuntu change:
  - desktop file,
  - no support for ccache and make -j.
* Closes Ubuntu: #69614.

Show diffs side-by-side

added added

removed removed

Lines of Context:
avidemux/oplug_ogm/op_ogsavecopy.cpp
125
125
 
126
126
                        if(!  video_body->getFrameNoAlloc (frameStart+frame, _videoBuffer, &len,     &flags)) 
127
127
                                return 0;               
128
 
                        encoding_gui->feedFrame(len);
 
128
                        encoding_gui->setFrame(frame,len,0,_togo);
129
129
                        return videoStream->write(len,_videoBuffer,flags,frame);
130
130
                }
131
131
                
175
175
 
176
176
                                }
177
177
                        }
178
 
                encoding_gui->feedFrame(len);
 
178
                encoding_gui->setFrame(frame,len,0,_togo);
179
179
                return videoStream->write(len,_videoBuffer,flags,frame);
180
180
                return ret1;
181
181