diff options
| author | johannkoenig@chromium.org <johannkoenig@chromium.org> | 2014-09-08 18:46:28 +0000 |
|---|---|---|
| committer | johannkoenig@chromium.org <johannkoenig@chromium.org> | 2014-09-08 18:46:28 +0000 |
| commit | d95585fb0ec024f6abd96f7b02e0df58019d46af (patch) | |
| tree | 099198c9fe84d7f873666002a1d5c63421785899 /source/libvpx/vpx/vpx_codec.h | |
| parent | 0f393e92b0e220eeaa6acb0ad31e696fa5c67ccd (diff) | |
| download | libvpx-d95585fb0ec024f6abd96f7b02e0df58019d46af.tar.gz | |
libvpx: Pull from upstream
Current HEAD: c731d6a4f19eea861ceb2ff31399420b2452eb74
git log from upstream:
395f2e8 vp8 encoder: remove vp8_yv12_copy_partial_frame_neon
980abf6 Fixing Mac OS build.
fcd431f libyuv: cherry-pick MSVC arm build fix
1f19ebb Replacing vp9_get_mb_ss_sse2 asm implementation with intrinsics.
1dd9a63 Correct the mode decisions in special cases
1100e26 Removing postproc mmx code.
c97f5e8 vp8 common: change 'HAVE_NEON_ASM' to 'HAVE_NEON' for compiling functions of NEON intrinsics.
a808344 fix x86-darwin* build
35fadf1 bilinearpredict_neon: fix type conversion warnings
bb4950d vp9: correct context buffer resize check
440f509 vp9: fail decode if block/frame refs are corrupt
dbdb87b Fix a visual studio warning
d435148 Enable adaptive motion search for ARF coding
b1153f3 Map motion magnitude in VP9 denoiser.
7897059 Adding temp cpi var.
91998e6 Removing sz member from vpx_codec_priv.
d75266f Update the condition when COPY_BLOCK is chosen.
4909435 Removing unused function prototypes.
202edb3 Actually resetting random generator for all variance test cases.
e30f769 Fix a bug in VP9 denoiser.
ec94967 Revert "Revert "VP8 for ARMv8 by using NEON intrinsics 10""
a51704d vp8 common: change 'HAVE_NEON_ASM' to 'HAVE_NEON' for compiling idct_blk_neon.c.
0002da3 arm: Fix building vp8_subpixelvariance_neon.c with MSVC
48197f0 Adding sse2 variant for vp9_mse{8x8, 8x16, 16x8}.
<...>
TBR=tomfinegan@chromium.org
Review URL: https://codereview.chromium.org/554673004
git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libvpx@291859 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Diffstat (limited to 'source/libvpx/vpx/vpx_codec.h')
| -rw-r--r-- | source/libvpx/vpx/vpx_codec.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/source/libvpx/vpx/vpx_codec.h b/source/libvpx/vpx/vpx_codec.h index 07df72a..b25308e 100644 --- a/source/libvpx/vpx/vpx_codec.h +++ b/source/libvpx/vpx/vpx_codec.h @@ -203,9 +203,11 @@ extern "C" { const char *err_detail; /**< Detailed info, if available */ vpx_codec_flags_t init_flags; /**< Flags passed at init time */ union { - struct vpx_codec_dec_cfg *dec; /**< Decoder Configuration Pointer */ - struct vpx_codec_enc_cfg *enc; /**< Encoder Configuration Pointer */ - void *raw; + /**< Decoder Configuration Pointer */ + const struct vpx_codec_dec_cfg *dec; + /**< Encoder Configuration Pointer */ + const struct vpx_codec_enc_cfg *enc; + const void *raw; } config; /**< Configuration pointer aliasing union */ vpx_codec_priv_t *priv; /**< Algorithm private storage */ } vpx_codec_ctx_t; @@ -215,9 +217,9 @@ extern "C" { * This enumeration determines the bit depth of the codec. */ typedef enum vpx_bit_depth { - VPX_BITS_8, /**< 8 bits */ - VPX_BITS_10, /**< 10 bits */ - VPX_BITS_12 /**< 12 bits */ + VPX_BITS_8 = 8, /**< 8 bits */ + VPX_BITS_10 = 10, /**< 10 bits */ + VPX_BITS_12 = 12, /**< 12 bits */ } vpx_bit_depth_t; /* |