← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to source/blender/quicktime/quicktime_import.h

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/quicktime/quicktime_import.h
43
43
#include "../imbuf/IMB_imbuf_types.h"
44
44
 
45
45
#ifndef USE_QTKIT
46
 
#ifndef __MOVIES__
47
 
#ifdef _WIN32
48
 
#include <Movies.h>
49
 
#elif defined(__APPLE__)
50
 
#define __CARBONSOUND__
51
 
#import <Carbon/Carbon.h>
52
 
#include <QuickTime/Movies.h>
53
 
#endif
54
 
#endif //__MOVIES__
55
 
#endif //USE_QTKIT
 
46
#  ifndef __MOVIES__
 
47
#    ifdef _WIN32
 
48
#      include <Movies.h>
 
49
#    elif defined(__APPLE__)
 
50
#      define __CARBONSOUND__
 
51
#      import <Carbon/Carbon.h>
 
52
#      include <QuickTime/Movies.h>
 
53
#    endif
 
54
#  endif  /* __MOVIES__ */
 
55
#endif  /* USE_QTKIT */
56
56
 
57
57
#ifdef _WIN32
58
 
#ifndef __FIXMATH__
59
 
#include <FixMath.h>
60
 
#endif /* __FIXMATH__ */
 
58
#  ifndef __FIXMATH__
 
59
#    include <FixMath.h>
 
60
#  endif /* __FIXMATH__ */
61
61
#endif /* _WIN32 _ */
62
62
 
63
 
 
64
 
char *get_valid_qtname(char *name);
65
 
 
66
 
 
67
 
// quicktime movie import functions
 
63
char *get_valid_qtname(const char *name);
 
64
 
 
65
/* quicktime movie import functions */
68
66
 
69
67
int             anim_is_quicktime (const char *name);
70
68
int             startquicktime (struct anim *anim);
71
69
void    free_anim_quicktime (struct anim *anim);
72
70
ImBuf  *qtime_fetchibuf (struct anim *anim, int position);
73
71
 
74
 
// quicktime image import functions
 
72
/* quicktime image import functions */
75
73
 
76
74
int             imb_is_a_quicktime (char *name);
77
75
ImBuf  *imb_quicktime_decode(unsigned char *mem, int size, int flags);
78
76
 
79
 
#endif  // __QUICKTIME_IMPORT_H__
 
77
#endif  /* __QUICKTIME_IMPORT_H__ */