diff options
| author | James Zern <jzern@google.com> | 2010-05-22 13:56:14 -0400 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2010-05-24 12:59:39 -0400 |
| commit | 24fcc79892fe0c404367b032a9dc44c78f508a68 (patch) | |
| tree | 6756f401a3bbca5df18f0cfc8e903a0b556ae346 | |
| parent | 6cd4a10e167203d1deb79abf60ee72599e97891b (diff) | |
| download | libvpx-24fcc79892fe0c404367b032a9dc44c78f508a68.tar libvpx-24fcc79892fe0c404367b032a9dc44c78f508a68.tar.gz libvpx-24fcc79892fe0c404367b032a9dc44c78f508a68.tar.bz2 libvpx-24fcc79892fe0c404367b032a9dc44c78f508a68.zip | |
Restore and deprecate img_fmt
Deprecate img_fmt type and constants removed in 6cd4a10 allowing older
code to build.
Addresses: http://code.google.com/p/webm/issues/detail?id=25
Change-Id: I786bff1ebde4d1621c6f58dcc685f382bb733e29
| -rw-r--r-- | vpx_codec/vpx_image.h | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/vpx_codec/vpx_image.h b/vpx_codec/vpx_image.h index a25999ce6..1d86152c4 100644 --- a/vpx_codec/vpx_image.h +++ b/vpx_codec/vpx_image.h @@ -58,6 +58,39 @@ extern "C" { } vpx_img_fmt_t; /**< alias for enum vpx_img_fmt */ +#if !defined(VPX_CODEC_DISABLE_COMPAT) || !VPX_CODEC_DISABLE_COMPAT +#define IMG_FMT_PLANAR VPX_IMG_FMT_PLANAR /**< \deprecated Use #VPX_IMG_FMT_PLANAR */ +#define IMG_FMT_UV_FLIP VPX_IMG_FMT_UV_FLIP /**< \deprecated Use #VPX_IMG_FMT_UV_FLIP */ +#define IMG_FMT_HAS_ALPHA VPX_IMG_FMT_HAS_ALPHA /**< \deprecated Use #VPX_IMG_FMT_HAS_ALPHA */ + + /*!\brief Deprecated list of supported image formats + * \deprecated New code should use #vpx_img_fmt + */ +#define img_fmt vpx_img_fmt + /*!\brief alias for enum img_fmt. + * \deprecated New code should use #vpx_img_fmt_t + */ +#define img_fmt_t vpx_img_fmt_t + +#define IMG_FMT_NONE VPX_IMG_FMT_NONE /**< \deprecated Use #VPX_IMG_FMT_NONE */ +#define IMG_FMT_RGB24 VPX_IMG_FMT_RGB24 /**< \deprecated Use #VPX_IMG_FMT_RGB24 */ +#define IMG_FMT_RGB32 VPX_IMG_FMT_RGB32 /**< \deprecated Use #VPX_IMG_FMT_RGB32 */ +#define IMG_FMT_RGB565 VPX_IMG_FMT_RGB565 /**< \deprecated Use #VPX_IMG_FMT_RGB565 */ +#define IMG_FMT_RGB555 VPX_IMG_FMT_RGB555 /**< \deprecated Use #VPX_IMG_FMT_RGB555 */ +#define IMG_FMT_UYVY VPX_IMG_FMT_UYVY /**< \deprecated Use #VPX_IMG_FMT_UYVY */ +#define IMG_FMT_YUY2 VPX_IMG_FMT_YUY2 /**< \deprecated Use #VPX_IMG_FMT_YUY2 */ +#define IMG_FMT_YVYU VPX_IMG_FMT_YVYU /**< \deprecated Use #VPX_IMG_FMT_YVYU */ +#define IMG_FMT_BGR24 VPX_IMG_FMT_BGR24 /**< \deprecated Use #VPX_IMG_FMT_BGR24 */ +#define IMG_FMT_RGB32_LE VPX_IMG_FMT_RGB32_LE /**< \deprecated Use #VPX_IMG_FMT_RGB32_LE */ +#define IMG_FMT_ARGB VPX_IMG_FMT_ARGB /**< \deprecated Use #VPX_IMG_FMT_ARGB */ +#define IMG_FMT_ARGB_LE VPX_IMG_FMT_ARGB_LE /**< \deprecated Use #VPX_IMG_FMT_ARGB_LE */ +#define IMG_FMT_RGB565_LE VPX_IMG_FMT_RGB565_LE /**< \deprecated Use #VPX_IMG_FMT_RGB565_LE */ +#define IMG_FMT_RGB555_LE VPX_IMG_FMT_RGB555_LE /**< \deprecated Use #VPX_IMG_FMT_RGB555_LE */ +#define IMG_FMT_YV12 VPX_IMG_FMT_YV12 /**< \deprecated Use #VPX_IMG_FMT_YV12 */ +#define IMG_FMT_I420 VPX_IMG_FMT_I420 /**< \deprecated Use #VPX_IMG_FMT_I420 */ +#define IMG_FMT_VPXYV12 VPX_IMG_FMT_VPXYV12 /**< \deprecated Use #VPX_IMG_FMT_VPXYV12 */ +#define IMG_FMT_VPXI420 VPX_IMG_FMT_VPXI420 /**< \deprecated Use #VPX_IMG_FMT_VPXI420 */ +#endif /* VPX_CODEC_DISABLE_COMPAT */ /**\brief Image Descriptor */ typedef struct vpx_image |