| OLD | NEW |
| 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 __INC_VP8D_INT_H | 12 #ifndef ONYXD_INT_H_ |
| 13 #define __INC_VP8D_INT_H | 13 #define ONYXD_INT_H_ |
| 14 |
| 14 #include "vpx_config.h" | 15 #include "vpx_config.h" |
| 15 #include "vp8/common/onyxd.h" | 16 #include "vp8/common/onyxd.h" |
| 16 #include "treereader.h" | 17 #include "treereader.h" |
| 17 #include "vp8/common/onyxc_int.h" | 18 #include "vp8/common/onyxc_int.h" |
| 18 #include "vp8/common/threading.h" | 19 #include "vp8/common/threading.h" |
| 19 | 20 |
| 20 #if CONFIG_ERROR_CONCEALMENT | 21 #if CONFIG_ERROR_CONCEALMENT |
| 21 #include "ec_types.h" | 22 #include "ec_types.h" |
| 22 #endif | 23 #endif |
| 23 | 24 |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 } while(0) | 139 } while(0) |
| 139 #else | 140 #else |
| 140 #define CHECK_MEM_ERROR(lval,expr) do {\ | 141 #define CHECK_MEM_ERROR(lval,expr) do {\ |
| 141 lval = (expr); \ | 142 lval = (expr); \ |
| 142 if(!lval) \ | 143 if(!lval) \ |
| 143 vpx_internal_error(&pbi->common.error, VPX_CODEC_MEM_ERROR,\ | 144 vpx_internal_error(&pbi->common.error, VPX_CODEC_MEM_ERROR,\ |
| 144 "Failed to allocate "#lval);\ | 145 "Failed to allocate "#lval);\ |
| 145 } while(0) | 146 } while(0) |
| 146 #endif | 147 #endif |
| 147 | 148 |
| 148 #endif | 149 #endif // ONYXD_INT_H_ |
| OLD | NEW |