← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/blender/gutsy-security

« back to all changes in this revision

Viewing changes to source/blender/src/editsound.c

  • Committer: Bazaar Package Importer
  • Author(s): Lukas Fittl
  • Date: 2006-09-20 01:57:27 UTC
  • mfrom: (1.2.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20060920015727-gmoqlxwstx9wwqs3
Tags: 2.42a-1ubuntu1
* Merge from Debian unstable (Closes: Malone #55903). Remaining changes:
  - debian/genpot: Add python scripts from Lee June <blender@eyou.com> to
    generate a reasonable PO template from the sources. Since gettext is used
    in a highly nonstandard way, xgettext does not work for this job.
  - debian/rules: Call the scripts, generate po/blender.pot, and clean it up
    in the clean target.
  - Add a proper header to the generated PO template.
* debian/control: Build depend on libavformat-dev >= 3:0.cvs20060823-3.1,
  otherwise this package will FTBFS

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/src/editsound.c
1
1
/**
2
 
 * $Id: editsound.c,v 1.26 2005/10/20 14:41:10 ton Exp $
 
2
 * $Id: editsound.c,v 1.27 2006/06/14 12:42:23 ton Exp $
3
3
 *
4
4
 * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
5
5
 *
314
314
                readPackedFile(pf, &shortbuf, 2);
315
315
                if(G.order==B_ENDIAN)
316
316
                {
317
 
                        /* was SWITCH_SHORT before */
318
 
                        char s_i, *p_i;
319
 
                        p_i= (char *)&(shortbuf);
320
 
                        s_i= p_i[0];
321
 
                        p_i[0]= p_i[1];
322
 
                        p_i[1]= s_i;
 
317
                        SWITCH_SHORT(shortbuf);
323
318
                }
324
319
 
325
320
                /* read the number of channels */
327
322
 
328
323
                if(G.order==B_ENDIAN)
329
324
                {
330
 
                        /* was SWITCH_SHORT before */
331
 
                        char s_i, *p_i;
332
 
                        p_i= (char *)&(shortbuf);
333
 
                        s_i= p_i[0];
334
 
                        p_i[0]= p_i[1];
335
 
                        p_i[1]= s_i;
 
325
                        SWITCH_SHORT(shortbuf);
336
326
                }
337
327
 
338
328
                /* check the number of channels */
367
357
                readPackedFile(pf, &shortbuf, 2);
368
358
                if(G.order==B_ENDIAN)
369
359
                {
370
 
                        /* was SWITCH_SHORT before */
371
 
                        char s_i, *p_i;
372
 
                        p_i= (char *)&(shortbuf);
373
 
                        s_i= p_i[0];
374
 
                        p_i[0]= p_i[1];
375
 
                        p_i[1]= s_i;
 
360
                        SWITCH_SHORT(shortbuf);
376
361
                }
377
362
                bits = shortbuf;
378
363