diff options
| author | James Zern <jzern@google.com> | 2010-05-20 23:22:39 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2010-05-21 09:19:13 -0400 |
| commit | 6cd4a10e167203d1deb79abf60ee72599e97891b (patch) | |
| tree | bfb30469de608e34c381a418cab0f63797a0ce1e /ivfenc.c | |
| parent | 1df0314e7b55b96ec56dd47baac68d06deff5491 (diff) | |
| download | libvpx-6cd4a10e167203d1deb79abf60ee72599e97891b.tar libvpx-6cd4a10e167203d1deb79abf60ee72599e97891b.tar.gz libvpx-6cd4a10e167203d1deb79abf60ee72599e97891b.tar.bz2 libvpx-6cd4a10e167203d1deb79abf60ee72599e97891b.zip | |
Put img_fmt in the vpx namespace
Avoid an potential name clashes and match other external types.
s/IMG_FMT/VPX_$&/g
s/img_fmt/vpx_$&/g
Change-Id: Ia7ad5bbb6424416b37e71e5f5eb1eca31c3c707f
Diffstat (limited to 'ivfenc.c')
| -rw-r--r-- | ivfenc.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -247,10 +247,10 @@ static int read_frame(FILE *f, vpx_image_t *img, unsigned int is_ivf) switch (plane) { case 1: - ptr = img->planes[img->fmt==IMG_FMT_YV12? PLANE_V : PLANE_U]; + ptr = img->planes[img->fmt==VPX_IMG_FMT_YV12? PLANE_V : PLANE_U]; break; case 2: - ptr = img->planes[img->fmt==IMG_FMT_YV12?PLANE_U : PLANE_V]; + ptr = img->planes[img->fmt==VPX_IMG_FMT_YV12?PLANE_U : PLANE_V]; break; default: ptr = img->planes[plane]; @@ -869,7 +869,7 @@ int main(int argc, const char **argv_) SHOW(kf_max_dist); } - vpx_img_alloc(&raw, arg_use_i420 ? IMG_FMT_I420 : IMG_FMT_YV12, + vpx_img_alloc(&raw, arg_use_i420 ? VPX_IMG_FMT_I420 : VPX_IMG_FMT_YV12, cfg.g_w, cfg.g_h, 1); // This was added so that ivfenc will create monotically increasing |