diff options
| author | Jingning Han <jingning@google.com> | 2015-08-15 22:40:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-08-15 22:40:11 +0000 |
| commit | bbb9ca4535bf0f32706209fd4463e16cc8d42d7a (patch) | |
| tree | 3314dd422856e644b2907c2b69e452ebc70c58f2 /vp10/decoder/decodeframe.c | |
| parent | d0307158cddcf71ae6f856924ad5cb7632fa55bd (diff) | |
| parent | 89af744ba6450daa55d2985c826fa58c8317e8d8 (diff) | |
| download | libvpx-bbb9ca4535bf0f32706209fd4463e16cc8d42d7a.tar libvpx-bbb9ca4535bf0f32706209fd4463e16cc8d42d7a.tar.gz libvpx-bbb9ca4535bf0f32706209fd4463e16cc8d42d7a.tar.bz2 libvpx-bbb9ca4535bf0f32706209fd4463e16cc8d42d7a.zip | |
Merge "Change vp9_ prefix function names in vpx_scale to vpx_"
Diffstat (limited to 'vp10/decoder/decodeframe.c')
| -rw-r--r-- | vp10/decoder/decodeframe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp10/decoder/decodeframe.c b/vp10/decoder/decodeframe.c index e7da1c63d..67f6909e4 100644 --- a/vp10/decoder/decodeframe.c +++ b/vp10/decoder/decodeframe.c @@ -1236,7 +1236,7 @@ static void setup_frame_size(VP10_COMMON *cm, struct vpx_read_bit_buffer *rb) { setup_display_size(cm, rb); lock_buffer_pool(pool); - if (vp9_realloc_frame_buffer( + if (vpx_realloc_frame_buffer( get_frame_new_buffer(cm), cm->width, cm->height, cm->subsampling_x, cm->subsampling_y, #if CONFIG_VP9_HIGHBITDEPTH @@ -1317,7 +1317,7 @@ static void setup_frame_size_with_refs(VP10_COMMON *cm, setup_display_size(cm, rb); lock_buffer_pool(pool); - if (vp9_realloc_frame_buffer( + if (vpx_realloc_frame_buffer( get_frame_new_buffer(cm), cm->width, cm->height, cm->subsampling_x, cm->subsampling_y, #if CONFIG_VP9_HIGHBITDEPTH |