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

Side by Side Diff: source/libvpx/vp9/common/vp9_blockd.h

Issue 1339513003: libvpx: Pull from upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master
Patch Set: Created 5 years, 3 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
« no previous file with comments | « source/libvpx/vp8/vp8_dx_iface.c ('k') | source/libvpx/vp9/common/vp9_common_data.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 VP9_COMMON_VP9_BLOCKD_H_ 12 #ifndef VP9_COMMON_VP9_BLOCKD_H_
13 #define VP9_COMMON_VP9_BLOCKD_H_ 13 #define VP9_COMMON_VP9_BLOCKD_H_
14 14
15 #include "./vpx_config.h" 15 #include "./vpx_config.h"
16 16
17 #include "vpx_dsp/vpx_dsp_common.h"
17 #include "vpx_ports/mem.h" 18 #include "vpx_ports/mem.h"
18 #include "vpx_scale/yv12config.h" 19 #include "vpx_scale/yv12config.h"
19 20
20 #include "vp9/common/vp9_common_data.h" 21 #include "vp9/common/vp9_common_data.h"
21 #include "vp9/common/vp9_entropy.h" 22 #include "vp9/common/vp9_entropy.h"
22 #include "vp9/common/vp9_entropymode.h" 23 #include "vp9/common/vp9_entropymode.h"
23 #include "vp9/common/vp9_mv.h" 24 #include "vp9/common/vp9_mv.h"
24 #include "vp9/common/vp9_scale.h" 25 #include "vp9/common/vp9_scale.h"
25 #include "vp9/common/vp9_seg_common.h" 26 #include "vp9/common/vp9_seg_common.h"
26 #include "vp9/common/vp9_tile_common.h" 27 #include "vp9/common/vp9_tile_common.h"
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 299
299 void vp9_set_contexts(const MACROBLOCKD *xd, struct macroblockd_plane *pd, 300 void vp9_set_contexts(const MACROBLOCKD *xd, struct macroblockd_plane *pd,
300 BLOCK_SIZE plane_bsize, TX_SIZE tx_size, int has_eob, 301 BLOCK_SIZE plane_bsize, TX_SIZE tx_size, int has_eob,
301 int aoff, int loff); 302 int aoff, int loff);
302 303
303 #ifdef __cplusplus 304 #ifdef __cplusplus
304 } // extern "C" 305 } // extern "C"
305 #endif 306 #endif
306 307
307 #endif // VP9_COMMON_VP9_BLOCKD_H_ 308 #endif // VP9_COMMON_VP9_BLOCKD_H_
OLDNEW
« no previous file with comments | « source/libvpx/vp8/vp8_dx_iface.c ('k') | source/libvpx/vp9/common/vp9_common_data.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698