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

Side by Side Diff: third_party/ffmpeg/include/libavutil/mem.h

Issue 854006: Revert 41386 - Removed custom FFmpegLock. Removed ffmpeg headers from third_p... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 9 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
Property Changes:
Added: svn:mergeinfo
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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 /** 95 /**
96 * Frees a memory block which has been allocated with av_malloc(z)() or 96 * Frees a memory block which has been allocated with av_malloc(z)() or
97 * av_realloc() and set the pointer pointing to it to NULL. 97 * av_realloc() and set the pointer pointing to it to NULL.
98 * @param ptr Pointer to the pointer to the memory block which should 98 * @param ptr Pointer to the pointer to the memory block which should
99 * be freed. 99 * be freed.
100 * @see av_free() 100 * @see av_free()
101 */ 101 */
102 void av_freep(void *ptr); 102 void av_freep(void *ptr);
103 103
104 #endif /* AVUTIL_MEM_H */ 104 #endif /* AVUTIL_MEM_H */
OLDNEW
« no previous file with comments | « third_party/ffmpeg/include/libavutil/md5.h ('k') | third_party/ffmpeg/include/libavutil/pixfmt.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698