Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(251)

Side by Side Diff: source/patched-ffmpeg-mt/libavutil/mem.h

Issue 2850032: ffmpeg update to june 23 version which fixes mp4 crash on still frames with 3... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: Created 10 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « source/patched-ffmpeg-mt/libavutil/log.c ('k') | source/patched-ffmpeg-mt/mt-work/todo.txt » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at> 2 * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
3 * 3 *
4 * This file is part of FFmpeg. 4 * This file is part of FFmpeg.
5 * 5 *
6 * FFmpeg is free software; you can redistribute it and/or 6 * FFmpeg is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Lesser General Public 7 * modify it under the terms of the GNU Lesser General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2.1 of the License, or (at your option) any later version. 9 * version 2.1 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 10 matching lines...) Expand all
21 /** 21 /**
22 * @file 22 * @file
23 * memory handling functions 23 * memory handling functions
24 */ 24 */
25 25
26 #ifndef AVUTIL_MEM_H 26 #ifndef AVUTIL_MEM_H
27 #define AVUTIL_MEM_H 27 #define AVUTIL_MEM_H
28 28
29 #include "attributes.h" 29 #include "attributes.h"
30 30
31 #if defined(__ICC) || defined(__SUNPRO_C) 31 #if defined(__ICC) && _ICC < 1200 || defined(__SUNPRO_C)
32 #define DECLARE_ALIGNED(n,t,v) t __attribute__ ((aligned (n))) v 32 #define DECLARE_ALIGNED(n,t,v) t __attribute__ ((aligned (n))) v
33 #define DECLARE_ASM_CONST(n,t,v) const t __attribute__ ((aligned (n))) v 33 #define DECLARE_ASM_CONST(n,t,v) const t __attribute__ ((aligned (n))) v
34 #elif defined(__TI_COMPILER_VERSION__) 34 #elif defined(__TI_COMPILER_VERSION__)
35 #define DECLARE_ALIGNED(n,t,v) \ 35 #define DECLARE_ALIGNED(n,t,v) \
36 AV_PRAGMA(DATA_ALIGN(v,n)) \ 36 AV_PRAGMA(DATA_ALIGN(v,n)) \
37 t __attribute__((aligned(n))) v 37 t __attribute__((aligned(n))) v
38 #define DECLARE_ASM_CONST(n,t,v) \ 38 #define DECLARE_ASM_CONST(n,t,v) \
39 AV_PRAGMA(DATA_ALIGN(v,n)) \ 39 AV_PRAGMA(DATA_ALIGN(v,n)) \
40 static const t __attribute__((aligned(n))) v 40 static const t __attribute__((aligned(n))) v
41 #elif defined(__GNUC__) 41 #elif defined(__GNUC__)
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 /** 116 /**
117 * Frees a memory block which has been allocated with av_malloc(z)() or 117 * Frees a memory block which has been allocated with av_malloc(z)() or
118 * av_realloc() and set the pointer pointing to it to NULL. 118 * av_realloc() and set the pointer pointing to it to NULL.
119 * @param ptr Pointer to the pointer to the memory block which should 119 * @param ptr Pointer to the pointer to the memory block which should
120 * be freed. 120 * be freed.
121 * @see av_free() 121 * @see av_free()
122 */ 122 */
123 void av_freep(void *ptr); 123 void av_freep(void *ptr);
124 124
125 #endif /* AVUTIL_MEM_H */ 125 #endif /* AVUTIL_MEM_H */
OLDNEW
« no previous file with comments | « source/patched-ffmpeg-mt/libavutil/log.c ('k') | source/patched-ffmpeg-mt/mt-work/todo.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698