← Back to branch summary

~videolan/vlc/full-packaging.precise

« back to all changes in this revision

Viewing changes to modules/video_filter/atmo/AtmoExternalCaptureInput.h

  • Committer: Benjamin Drung
  • Date: 2012-10-16 20:10:36 UTC
  • mfrom: (1.2.20)
  • Revision ID: git-v1:de31c1ccace0bc06a1119f5fd74bdb4a67d1399b
Merge tag 'upstream/2.0.4' into precise

Upstream version 2.0.4

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/video_filter/atmo/AtmoExternalCaptureInput.h
36
36
    CRITICAL_SECTION m_BufferLock;
37
37
#endif
38
38
 
39
 
    BITMAPINFOHEADER m_CurrentFrameHeader;
 
39
    VLC_BITMAPINFOHEADER m_CurrentFrameHeader;
40
40
    void *m_pCurrentFramePixels;
41
41
 
42
42
    virtual DWORD Execute(void);
47
47
       this method is called from the com server AtmoLiveViewControlImpl!
48
48
       or inside videolan from the filter method to start a new processing
49
49
    */
50
 
    void DeliverNewSourceDataPaket(BITMAPINFOHEADER *bmpInfoHeader,void *pixelData);
 
50
    void DeliverNewSourceDataPaket(VLC_BITMAPINFOHEADER *bmpInfoHeader,void *pixelData);
51
51
 
52
52
public:
53
53
    CAtmoExternalCaptureInput(CAtmoDynData *pAtmoDynData);