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/libvpx/vpx_ports/vpx_timer.h

Issue 484923003: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 6 years, 4 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/libvpx/vpx/src/vpx_image.c ('k') | source/libvpx/vpxdec.c » ('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) 2010 The WebM project authors. All Rights Reserved. 2 * Copyright (c) 2010 The WebM project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 11
12 #ifndef VPX_PORTS_VPX_TIMER_H_ 12 #ifndef VPX_PORTS_VPX_TIMER_H_
13 #define VPX_PORTS_VPX_TIMER_H_ 13 #define VPX_PORTS_VPX_TIMER_H_
14
15 #include "./vpx_config.h"
16
14 #include "vpx/vpx_integer.h" 17 #include "vpx/vpx_integer.h"
15 18
16 #if CONFIG_OS_SUPPORT 19 #if CONFIG_OS_SUPPORT
17 20
18 #if defined(_WIN32) 21 #if defined(_WIN32)
19 /* 22 /*
20 * Win32 specific includes 23 * Win32 specific includes
21 */ 24 */
22 #ifndef WIN32_LEAN_AND_MEAN 25 #ifndef WIN32_LEAN_AND_MEAN
23 #define WIN32_LEAN_AND_MEAN 26 #define WIN32_LEAN_AND_MEAN
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 vpx_usec_timer_mark(struct vpx_usec_timer *t) { } 111 vpx_usec_timer_mark(struct vpx_usec_timer *t) { }
109 112
110 static INLINE int 113 static INLINE int
111 vpx_usec_timer_elapsed(struct vpx_usec_timer *t) { 114 vpx_usec_timer_elapsed(struct vpx_usec_timer *t) {
112 return 0; 115 return 0;
113 } 116 }
114 117
115 #endif /* CONFIG_OS_SUPPORT */ 118 #endif /* CONFIG_OS_SUPPORT */
116 119
117 #endif // VPX_PORTS_VPX_TIMER_H_ 120 #endif // VPX_PORTS_VPX_TIMER_H_
OLDNEW
« no previous file with comments | « source/libvpx/vpx/src/vpx_image.c ('k') | source/libvpx/vpxdec.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698