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

Side by Side Diff: source/libvpx/vpx/vpx_codec.h

Issue 1029663003: libvpx: Pull from upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master
Patch Set: Created 5 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
« no previous file with comments | « source/libvpx/vpx/vp8cx.h ('k') | source/libvpx/vpx/vpx_encoder.h » ('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
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 #endif 76 #endif
77 77
78 /*!\brief Current ABI version number 78 /*!\brief Current ABI version number
79 * 79 *
80 * \internal 80 * \internal
81 * If this file is altered in any way that changes the ABI, this value 81 * If this file is altered in any way that changes the ABI, this value
82 * must be bumped. Examples include, but are not limited to, changing 82 * must be bumped. Examples include, but are not limited to, changing
83 * types, removing or reassigning enums, adding/removing/rearranging 83 * types, removing or reassigning enums, adding/removing/rearranging
84 * fields to structures 84 * fields to structures
85 */ 85 */
86 #define VPX_CODEC_ABI_VERSION (2 + VPX_IMAGE_ABI_VERSION) /**<\hideinitializer*/ 86 #define VPX_CODEC_ABI_VERSION (3 + VPX_IMAGE_ABI_VERSION) /**<\hideinitializer*/
87 87
88 /*!\brief Algorithm return codes */ 88 /*!\brief Algorithm return codes */
89 typedef enum { 89 typedef enum {
90 /*!\brief Operation completed without error */ 90 /*!\brief Operation completed without error */
91 VPX_CODEC_OK, 91 VPX_CODEC_OK,
92 92
93 /*!\brief Unspecified error */ 93 /*!\brief Unspecified error */
94 VPX_CODEC_ERROR, 94 VPX_CODEC_ERROR,
95 95
96 /*!\brief Memory operation failed */ 96 /*!\brief Memory operation failed */
(...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after
470 470
471 471
472 #endif 472 #endif
473 473
474 /*!@} - end defgroup codec*/ 474 /*!@} - end defgroup codec*/
475 #ifdef __cplusplus 475 #ifdef __cplusplus
476 } 476 }
477 #endif 477 #endif
478 #endif // VPX_VPX_CODEC_H_ 478 #endif // VPX_VPX_CODEC_H_
479 479
OLDNEW
« no previous file with comments | « source/libvpx/vpx/vp8cx.h ('k') | source/libvpx/vpx/vpx_encoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698