← Back to branch summary

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

« back to all changes in this revision

Viewing changes to avidemux/ADM_outputs/oplug_ogm/op_ogsave.h

  • 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_outputs/oplug_ogm/op_ogsave.h
40
40
                        DIA_encoding            *encoding_gui;
41
41
                        ogm_page                *videoStream;
42
42
                        ogm_page                *audioStream;
 
43
                        Encoder                 *_encode;
43
44
                        
44
45
                                uint8_t         initAudio(void);
45
46
                                uint8_t         writeAudio(uint32_t j);
50
51
                                AVDMGenericAudioStream  *audioFilter;
51
52
                                
52
53
                        virtual uint8_t         initVideo(const char *name);
53
 
                        virtual uint8_t         writeVideo(uint32_t frame);
 
54
                        virtual int             writeVideo(uint32_t frame);
54
55
                                        
55
56
        public:
56
57
                                        ADM_ogmWrite(void);                             
63
64
protected:
64
65
                        
65
66
                        virtual uint8_t         initVideo(const char *name);                    
66
 
                        virtual uint8_t         writeVideo(uint32_t frame);
 
67
                        virtual int             writeVideo(uint32_t frame);
67
68
                        uint32_t                searchForward(uint32_t startframe);
68
69
                        uint32_t                _lastIPFrameSent;       
69
70
public:
75
76
{
76
77
protected:
77
78
                        AVDMGenericVideoStream  *_incoming;
78
 
                        Encoder                 *_encode;
79
79
                        uint32_t                _prestore;
80
80
                        uint32_t                _prestoring;
81
81
                        virtual uint8_t initVideo(const char *name);                    
82
 
                        virtual uint8_t writeVideo(uint32_t frame);     
 
82
                        virtual int     writeVideo(uint32_t frame);     
83
83
public:
84
84
                        ADM_ogmWriteProcess(void);
85
85
                        ~ADM_ogmWriteProcess(void);