diff options
| author | John Koleszar <jkoleszar@google.com> | 2010-11-04 21:50:37 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2010-11-04 21:50:37 -0400 |
| commit | 362f763cfe56d06ab667bf042a0614af32da711f (patch) | |
| tree | a2e968c4fb1afc3a70143ddc39b2ded5652242ea /vp8/common/alloccommon.c | |
| parent | 68041990735f3d731d41e94eb1142bd257cd5cf8 (diff) | |
| parent | 507eb4b57722f680993dda45db1eec985b4b3df6 (diff) | |
| download | libvpx-362f763cfe56d06ab667bf042a0614af32da711f.tar libvpx-362f763cfe56d06ab667bf042a0614af32da711f.tar.gz libvpx-362f763cfe56d06ab667bf042a0614af32da711f.tar.bz2 libvpx-362f763cfe56d06ab667bf042a0614af32da711f.zip | |
Merge remote branch 'internal/upstream' into HEAD
Conflicts:
vp8/common/alloccommon.c
vp8/common/onyxc_int.h
vp8/vp8_cx_iface.c
vpxenc.c
Diffstat (limited to 'vp8/common/alloccommon.c')
| -rw-r--r-- | vp8/common/alloccommon.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vp8/common/alloccommon.c b/vp8/common/alloccommon.c index 2b96b757e..5ab8e29ab 100644 --- a/vp8/common/alloccommon.c +++ b/vp8/common/alloccommon.c @@ -56,7 +56,7 @@ int vp8_alloc_frame_buffers(VP8_COMMON *oci, int width, int height) vp8_de_alloc_frame_buffers(oci); - // our internal buffers are always multiples of 16 + /* our internal buffers are always multiples of 16 */ if ((width & 0xf) != 0) width += 16 - (width & 0xf); @@ -179,10 +179,10 @@ void vp8_create_common(VP8_COMMON *oci) oci->clr_type = REG_YUV; oci->clamp_type = RECON_CLAMP_REQUIRED; - // Initialise reference frame sign bias structure to defaults + /* Initialise reference frame sign bias structure to defaults */ vpx_memset(oci->ref_frame_sign_bias, 0, sizeof(oci->ref_frame_sign_bias)); - // Default disable buffer to buffer copying + /* Default disable buffer to buffer copying */ oci->copy_buffer_to_gf = 0; oci->copy_buffer_to_arf = 0; } |