← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source/blender/avi/intern/avi_intern.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/avi/intern/avi_intern.h
37
37
unsigned int GET_FCC (FILE *fp);
38
38
unsigned int GET_TCC (FILE *fp);
39
39
 
40
 
#define PUT_FCC(ch4, fp) putc(ch4[0],fp); putc(ch4[1],fp); putc(ch4[2],fp); putc(ch4[3],fp)
41
 
#define PUT_FCCN(num, fp) putc((num>>0)&0377,fp); putc((num>>8)&0377,fp); putc((num>>16)&0377,fp); putc((num>>24)&0377,fp)
42
 
#define PUT_TCC(ch2, fp) putc(ch2[0],fp); putc(ch2[1],fp)
 
40
#define PUT_FCC(ch4, fp) \
 
41
{ \
 
42
        putc(ch4[0], fp); \
 
43
        putc(ch4[1], fp); \
 
44
        putc(ch4[2], fp); \
 
45
        putc(ch4[3], fp); \
 
46
} (void)0
 
47
 
 
48
#define PUT_FCCN(num, fp) \
 
49
{ \
 
50
        putc((num >> 0)  & 0377, fp); \
 
51
        putc((num >> 8)  & 0377, fp); \
 
52
        putc((num >> 16) & 0377, fp); \
 
53
        putc((num >> 24) & 0377, fp); \
 
54
} (void)0
 
55
 
 
56
#define PUT_TCC(ch2, fp) \
 
57
{ \
 
58
        putc(ch2[0], fp); \
 
59
        putc(ch2[1], fp); \
 
60
} (void)0
43
61
 
44
62
void *avi_format_convert (AviMovie *movie, int stream, void *buffer, AviFormat from, AviFormat to, int *size);
45
63