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

Side by Side Diff: third_party/ffmpeg/include/libavutil/common.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 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 } 277 }
278 278
279 #include "mem.h" 279 #include "mem.h"
280 280
281 #ifdef HAVE_AV_CONFIG_H 281 #ifdef HAVE_AV_CONFIG_H
282 # include "config.h" 282 # include "config.h"
283 # include "internal.h" 283 # include "internal.h"
284 #endif /* HAVE_AV_CONFIG_H */ 284 #endif /* HAVE_AV_CONFIG_H */
285 285
286 #endif /* AVUTIL_COMMON_H */ 286 #endif /* AVUTIL_COMMON_H */
OLDNEW
« no previous file with comments | « third_party/ffmpeg/include/libavutil/base64.h ('k') | third_party/ffmpeg/include/libavutil/crc.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698