Message ID | 1471824541-19677-2-git-send-email-timothygu99@gmail.com |
---|---|
State | Accepted |
Commit | 54220ce731f1d251ba5125d6ebd926c258d20d44 |
Headers | show |
On Sun, Aug 21, 2016 at 05:09:01PM -0700, Timothy Gu wrote: > -#define AV_PIX_FMT_XVMC AV_PIX_FMT_XVMC_MPEG2_IDCT > + AV_PIX_FMT_XVMC = AV_PIX_FMT_XVMC_MPEG2_IDCT, I don't think this constitutes an API break, but comments are welcome. Timothy
On Sun, Aug 21, 2016 at 05:09:01PM -0700, Timothy Gu wrote: > This way, Doxygen is happier as aliases are now grouped together, and > it never handled #define's in an enum well in the first place. > > Y400A already exists as an enum assignment. > --- > libavutil/pixfmt.h | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h > index 6f71ac0..efc3714 100644 > --- a/libavutil/pixfmt.h > +++ b/libavutil/pixfmt.h > @@ -77,7 +77,7 @@ enum AVPixelFormat { > #if FF_API_XVMC > AV_PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing > AV_PIX_FMT_XVMC_MPEG2_IDCT, > -#define AV_PIX_FMT_XVMC AV_PIX_FMT_XVMC_MPEG2_IDCT > + AV_PIX_FMT_XVMC = AV_PIX_FMT_XVMC_MPEG2_IDCT, > #endif /* FF_API_XVMC */ > AV_PIX_FMT_UYVY422, ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1 > AV_PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3 > @@ -178,6 +178,7 @@ enum AVPixelFormat { > AV_PIX_FMT_YUV422P9LE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian > AV_PIX_FMT_VDA_VLD, ///< hardware decoding through VDA > AV_PIX_FMT_GBRP, ///< planar GBR 4:4:4 24bpp > + AV_PIX_FMT_GBR24P = AV_PIX_FMT_GBRP, // alias for #AV_PIX_FMT_GBRP > AV_PIX_FMT_GBRP9BE, ///< planar GBR 4:4:4 27bpp, big-endian > AV_PIX_FMT_GBRP9LE, ///< planar GBR 4:4:4 27bpp, little-endian > AV_PIX_FMT_GBRP10BE, ///< planar GBR 4:4:4 30bpp, big-endian > @@ -308,9 +309,6 @@ enum AVPixelFormat { > AV_PIX_FMT_NB, ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions > }; > > -#define AV_PIX_FMT_Y400A AV_PIX_FMT_GRAY8A > -#define AV_PIX_FMT_GBR24P AV_PIX_FMT_GBRP > - > #if AV_HAVE_BIGENDIAN > # define AV_PIX_FMT_NE(be, le) AV_PIX_FMT_##be > #else probably ok thx [...]
On Tue, Aug 23, 2016 at 12:28 PM Michael Niedermayer <michael@niedermayer.cc> wrote: > On Sun, Aug 21, 2016 at 05:09:01PM -0700, Timothy Gu wrote: > > This way, Doxygen is happier as aliases are now grouped together, and > > it never handled #define's in an enum well in the first place. > > > > Y400A already exists as an enum assignment. > > --- > > libavutil/pixfmt.h | 6 ++---- > > 1 file changed, 2 insertions(+), 4 deletions(-) > > > > diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h > > index 6f71ac0..efc3714 100644 > > --- a/libavutil/pixfmt.h > > +++ b/libavutil/pixfmt.h > > @@ -77,7 +77,7 @@ enum AVPixelFormat { > > #if FF_API_XVMC > > AV_PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common > packet passing > > AV_PIX_FMT_XVMC_MPEG2_IDCT, > > -#define AV_PIX_FMT_XVMC AV_PIX_FMT_XVMC_MPEG2_IDCT > > + AV_PIX_FMT_XVMC = AV_PIX_FMT_XVMC_MPEG2_IDCT, > > #endif /* FF_API_XVMC */ > > AV_PIX_FMT_UYVY422, ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1 > > AV_PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 > Y3 > > @@ -178,6 +178,7 @@ enum AVPixelFormat { > > AV_PIX_FMT_YUV422P9LE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb > sample per 2x1 Y samples), little-endian > > AV_PIX_FMT_VDA_VLD, ///< hardware decoding through VDA > > AV_PIX_FMT_GBRP, ///< planar GBR 4:4:4 24bpp > > + AV_PIX_FMT_GBR24P = AV_PIX_FMT_GBRP, // alias for #AV_PIX_FMT_GBRP > > AV_PIX_FMT_GBRP9BE, ///< planar GBR 4:4:4 27bpp, big-endian > > AV_PIX_FMT_GBRP9LE, ///< planar GBR 4:4:4 27bpp, little-endian > > AV_PIX_FMT_GBRP10BE, ///< planar GBR 4:4:4 30bpp, big-endian > > @@ -308,9 +309,6 @@ enum AVPixelFormat { > > AV_PIX_FMT_NB, ///< number of pixel formats, DO NOT USE THIS > if you want to link with shared libav* because the number of formats might > differ between versions > > }; > > > > -#define AV_PIX_FMT_Y400A AV_PIX_FMT_GRAY8A > > -#define AV_PIX_FMT_GBR24P AV_PIX_FMT_GBRP > > - > > #if AV_HAVE_BIGENDIAN > > # define AV_PIX_FMT_NE(be, le) AV_PIX_FMT_##be > > #else > > probably ok > > thx > Applied, thanks. Timothy
diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 6f71ac0..efc3714 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -77,7 +77,7 @@ enum AVPixelFormat { #if FF_API_XVMC AV_PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing AV_PIX_FMT_XVMC_MPEG2_IDCT, -#define AV_PIX_FMT_XVMC AV_PIX_FMT_XVMC_MPEG2_IDCT + AV_PIX_FMT_XVMC = AV_PIX_FMT_XVMC_MPEG2_IDCT, #endif /* FF_API_XVMC */ AV_PIX_FMT_UYVY422, ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1 AV_PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3 @@ -178,6 +178,7 @@ enum AVPixelFormat { AV_PIX_FMT_YUV422P9LE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian AV_PIX_FMT_VDA_VLD, ///< hardware decoding through VDA AV_PIX_FMT_GBRP, ///< planar GBR 4:4:4 24bpp + AV_PIX_FMT_GBR24P = AV_PIX_FMT_GBRP, // alias for #AV_PIX_FMT_GBRP AV_PIX_FMT_GBRP9BE, ///< planar GBR 4:4:4 27bpp, big-endian AV_PIX_FMT_GBRP9LE, ///< planar GBR 4:4:4 27bpp, little-endian AV_PIX_FMT_GBRP10BE, ///< planar GBR 4:4:4 30bpp, big-endian @@ -308,9 +309,6 @@ enum AVPixelFormat { AV_PIX_FMT_NB, ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions }; -#define AV_PIX_FMT_Y400A AV_PIX_FMT_GRAY8A -#define AV_PIX_FMT_GBR24P AV_PIX_FMT_GBRP - #if AV_HAVE_BIGENDIAN # define AV_PIX_FMT_NE(be, le) AV_PIX_FMT_##be #else