diff options
| author | Vignesh Venkatasubramanian <vigneshv@google.com> | 2014-03-20 16:30:56 -0700 |
|---|---|---|
| committer | Vignesh Venkatasubramanian <vigneshv@google.com> | 2014-03-20 17:21:16 -0700 |
| commit | a72801d7d92ababb50eecf27a36bd222d031d2fe (patch) | |
| tree | 6dcc67ce169123cb59ecb46e6948a561b1e20448 /libvpx/vp9/common/vp9_reconintra.c | |
| parent | a052f366468cde7dd95c0ec8c5a22fa1a004d0f8 (diff) | |
| download | android_external_libvpx-a72801d7d92ababb50eecf27a36bd222d031d2fe.tar.gz android_external_libvpx-a72801d7d92ababb50eecf27a36bd222d031d2fe.tar.bz2 android_external_libvpx-a72801d7d92ababb50eecf27a36bd222d031d2fe.zip | |
libvpx: Roll latest libvpx
Pulling changes related to fixing a rare bitstream issue on video upscaling.
Upstream Hash: 8e9c9f118cda45013f14cce7961dcc8df78ffebf
Change-Id: I8639e6ef48f0309efaf6bdf745719beb71f7a58d
Diffstat (limited to 'libvpx/vp9/common/vp9_reconintra.c')
| -rw-r--r-- | libvpx/vp9/common/vp9_reconintra.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libvpx/vp9/common/vp9_reconintra.c b/libvpx/vp9/common/vp9_reconintra.c index 86f4f35..915c1c1 100644 --- a/libvpx/vp9/common/vp9_reconintra.c +++ b/libvpx/vp9/common/vp9_reconintra.c @@ -18,7 +18,7 @@ #include "vp9/common/vp9_reconintra.h" #include "vp9/common/vp9_onyxc_int.h" -const TX_TYPE mode2txfm_map[INTRA_MODES] = { +const TX_TYPE intra_mode_to_tx_type_lookup[INTRA_MODES] = { DCT_DCT, // DC ADST_DCT, // V DCT_ADST, // H @@ -434,7 +434,7 @@ static void build_intra_predictors(const MACROBLOCKD *xd, const uint8_t *ref, } void vp9_predict_intra_block(const MACROBLOCKD *xd, int block_idx, int bwl_in, - TX_SIZE tx_size, int mode, + TX_SIZE tx_size, MB_PREDICTION_MODE mode, const uint8_t *ref, int ref_stride, uint8_t *dst, int dst_stride, int aoff, int loff, int plane) { |