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

Side by Side Diff: third_party/ffmpeg/include/libavutil/log.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 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 void av_log(void*, int level, const char *fmt, ...); 107 void av_log(void*, int level, const char *fmt, ...);
108 #endif 108 #endif
109 109
110 void av_vlog(void*, int level, const char *fmt, va_list); 110 void av_vlog(void*, int level, const char *fmt, va_list);
111 int av_log_get_level(void); 111 int av_log_get_level(void);
112 void av_log_set_level(int); 112 void av_log_set_level(int);
113 void av_log_set_callback(void (*)(void*, int, const char*, va_list)); 113 void av_log_set_callback(void (*)(void*, int, const char*, va_list));
114 void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl); 114 void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl);
115 115
116 #endif /* AVUTIL_LOG_H */ 116 #endif /* AVUTIL_LOG_H */
OLDNEW
« no previous file with comments | « third_party/ffmpeg/include/libavutil/intfloat_readwrite.h ('k') | third_party/ffmpeg/include/libavutil/lzo.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698