From 91471deecc97382d7998bd9f3b2bbbb5473ecba3 Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 5 Nov 2014 01:03:08 +0100 Subject: video: remove aliases for some rarely referenced image formats These formats are still supported; you just can't reference them via a defined constants directly. They are now handled via the generic passthrough. (If you want to use such a format, you either have to add the entry back, or use AV_PIX_FMT_* directly.) --- video/img_format.h | 49 ------------------------------------------------- 1 file changed, 49 deletions(-) (limited to 'video/img_format.h') diff --git a/video/img_format.h b/video/img_format.h index 8d01b86416..17062bbf68 100644 --- a/video/img_format.h +++ b/video/img_format.h @@ -144,27 +144,6 @@ enum mp_imgfmt { IMGFMT_422AP, IMGFMT_420AP, - IMGFMT_444AP16_LE, - IMGFMT_444AP16_BE, - IMGFMT_444AP10_LE, - IMGFMT_444AP10_BE, - IMGFMT_444AP9_LE, - IMGFMT_444AP9_BE, - - IMGFMT_422AP16_LE, - IMGFMT_422AP16_BE, - IMGFMT_422AP10_LE, - IMGFMT_422AP10_BE, - IMGFMT_422AP9_LE, - IMGFMT_422AP9_BE, - - IMGFMT_420AP16_LE, - IMGFMT_420AP16_BE, - IMGFMT_420AP10_LE, - IMGFMT_420AP10_BE, - IMGFMT_420AP9_LE, - IMGFMT_420AP9_BE, - // Gray IMGFMT_Y8, IMGFMT_Y16_LE, @@ -236,16 +215,6 @@ enum mp_imgfmt { // Planar RGB (planes are shuffled: plane 0 is G, etc.) IMGFMT_GBRP, - IMGFMT_GBRP9_LE, // similar organization to IMGFMT_444P9_LE - IMGFMT_GBRP9_BE, - IMGFMT_GBRP10_LE, - IMGFMT_GBRP10_BE, - IMGFMT_GBRP12_LE, - IMGFMT_GBRP12_BE, - IMGFMT_GBRP14_LE, - IMGFMT_GBRP14_BE, - IMGFMT_GBRP16_LE, - IMGFMT_GBRP16_BE, // XYZ colorspace, similar organization to RGB48. Even though it says "12", // the components are stored as 16 bit, with lower 4 bits set to 0. @@ -306,26 +275,8 @@ enum mp_imgfmt { IMGFMT_420P10 = MP_SELECT_LE_BE(IMGFMT_420P10_LE, IMGFMT_420P10_BE), IMGFMT_420P9 = MP_SELECT_LE_BE(IMGFMT_420P9_LE, IMGFMT_420P9_BE), - IMGFMT_444AP16 = MP_SELECT_LE_BE(IMGFMT_444AP16_LE, IMGFMT_444AP16_BE), - IMGFMT_444AP10 = MP_SELECT_LE_BE(IMGFMT_444AP10_LE, IMGFMT_444AP10_BE), - IMGFMT_444AP9 = MP_SELECT_LE_BE(IMGFMT_444AP9_LE, IMGFMT_444AP9_BE), - - IMGFMT_422AP16 = MP_SELECT_LE_BE(IMGFMT_422AP16_LE, IMGFMT_422AP16_BE), - IMGFMT_422AP10 = MP_SELECT_LE_BE(IMGFMT_422AP10_LE, IMGFMT_422AP10_BE), - IMGFMT_422AP9 = MP_SELECT_LE_BE(IMGFMT_422AP9_LE, IMGFMT_422AP9_BE), - - IMGFMT_420AP16 = MP_SELECT_LE_BE(IMGFMT_420AP16_LE, IMGFMT_420AP16_BE), - IMGFMT_420AP10 = MP_SELECT_LE_BE(IMGFMT_420AP10_LE, IMGFMT_420AP10_BE), - IMGFMT_420AP9 = MP_SELECT_LE_BE(IMGFMT_420AP9_LE, IMGFMT_420AP9_BE), - IMGFMT_Y16 = MP_SELECT_LE_BE(IMGFMT_Y16_LE, IMGFMT_Y16_BE), - IMGFMT_GBRP9 = MP_SELECT_LE_BE(IMGFMT_GBRP9_LE, IMGFMT_GBRP9_BE), - IMGFMT_GBRP10 = MP_SELECT_LE_BE(IMGFMT_GBRP10_LE, IMGFMT_GBRP10_BE), - IMGFMT_GBRP12 = MP_SELECT_LE_BE(IMGFMT_GBRP12_LE, IMGFMT_GBRP12_BE), - IMGFMT_GBRP14 = MP_SELECT_LE_BE(IMGFMT_GBRP14_LE, IMGFMT_GBRP14_BE), - IMGFMT_GBRP16 = MP_SELECT_LE_BE(IMGFMT_GBRP16_LE, IMGFMT_GBRP16_BE), - IMGFMT_XYZ12 = MP_SELECT_LE_BE(IMGFMT_XYZ12_LE, IMGFMT_XYZ12_BE), }; -- cgit v1.2.3