[cvs] / xvidcore / src / utils / mem_align.c Repository:
ViewVC logotype

Diff of /xvidcore/src/utils/mem_align.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.7, Thu Jun 13 22:05:09 2002 UTC revision 1.13, Sun Dec 15 01:12:01 2002 UTC
# Line 3  Line 3 
3   *  XVID MPEG-4 VIDEO CODEC   *  XVID MPEG-4 VIDEO CODEC
4   *  - Aligned memory allocator -   *  - Aligned memory allocator -
5   *   *
6   *  This program is an implementation of a part of one or more MPEG-4   *  Copyright(C) 2002 Michael Militzer <isibaar@xvid.org>
7   *  Video tools as specified in ISO/IEC 14496-2 standard.  Those intending   *               2002 Edouard Gomez
  *  to use this software module in hardware or software products are  
  *  advised that its use may infringe existing patents or copyrights, and  
  *  any such use would be at such party's own risk.  The original  
  *  developer of this software module and his/her company, and subsequent  
  *  editors and their companies, will have no liability for use of this  
  *  software or modifications or derivatives thereof.  
8   *   *
9   *  This program is free software ; you can redistribute it and/or modify   *  This file is part of XviD, a free MPEG-4 video encoder/decoder
10   *  it under the terms of the GNU General Public License as published by   *
11     *  XviD is free software; you can redistribute it and/or modify it
12     *  under the terms of the GNU General Public License as published by
13   *  the Free Software Foundation ; either version 2 of the License, or   *  the Free Software Foundation ; either version 2 of the License, or
14   *  (at your option) any later version.   *  (at your option) any later version.
15   *   *
# Line 26  Line 22 
22   *  along with this program ; if not, write to the Free Software   *  along with this program ; if not, write to the Free Software
23   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
24   *   *
25   ****************************************************************************/   *  Under section 8 of the GNU General Public License, the copyright
26  /*****************************************************************************   *  holders of XVID explicitly forbid distribution in the following
27   *   *  countries:
28   *  History   *
29   *   *    - Japan
30   *  - Thu Jun 13 23:50:07 2002 Added legal header   *    - United States of America
31     *
32     *  Linking XviD statically or dynamically with other modules is making a
33     *  combined work based on XviD.  Thus, the terms and conditions of the
34     *  GNU General Public License cover the whole combination.
35     *
36     *  As a special exception, the copyright holders of XviD give you
37     *  permission to link XviD with independent modules that communicate with
38     *  XviD solely through the VFW1.1 and DShow interfaces, regardless of the
39     *  license terms of these independent modules, and to copy and distribute
40     *  the resulting combined work under terms of your choice, provided that
41     *  every copy of the combined work is accompanied by a complete copy of
42     *  the source code of XviD (the version of XviD used to produce the
43     *  combined work), being distributed under the terms of the GNU General
44     *  Public License plus this exception.  An independent module is a module
45     *  which is not derived from or based on XviD.
46     *
47     *  Note that people who make modified versions of XviD are not obligated
48     *  to grant this special exception for their modified versions; it is
49     *  their choice whether to do so.  The GNU General Public License gives
50     *  permission to release a modified version without this exception; this
51     *  exception also makes it possible to release a modified version which
52     *  carries forward this exception.
53   *   *
54   *  $Id$   *  $Id$
55   *   *
56   ****************************************************************************/   ****************************************************************************/
57    
   
58  #include <stdlib.h>  #include <stdlib.h>
59  #include <stdio.h>  #include <stdio.h>
60  #include "mem_align.h"  #include "mem_align.h"
# Line 71  Line 88 
88                  if ((mem_ptr = (uint8_t *) malloc(size + 1)) != NULL) {                  if ((mem_ptr = (uint8_t *) malloc(size + 1)) != NULL) {
89    
90                          /* Store (mem_ptr - "real allocated memory") in *(mem_ptr-1) */                          /* Store (mem_ptr - "real allocated memory") in *(mem_ptr-1) */
91                          *mem_ptr = 0;                          *mem_ptr = 1;
92    
93                          /* Return the mem_ptr pointer */                          /* Return the mem_ptr pointer */
94                          return (void *) mem_ptr++;                          return (void *)(mem_ptr+1);
95    
96                  }                  }
97    
# Line 90  Line 107 
107    
108                          /* Align the tmp pointer */                          /* Align the tmp pointer */
109                          mem_ptr =                          mem_ptr =
110                                  (uint8_t *) ((uint32_t) (tmp + alignment - 1) &                                  (uint8_t *) ((ptr_t) (tmp + alignment - 1) &
111                                                           (~(uint32_t) (alignment - 1)));                                                           (~(ptr_t) (alignment - 1)));
112    
113                          /*                          /*
114                           * Special case where malloc have already satisfied the alignment                           * Special case where malloc have already satisfied the alignment

Legend:
Removed from v.1.7  
changed lines
  Added in v.1.13

No admin address has been configured
ViewVC Help
Powered by ViewVC 1.0.4