| Message ID | b1bb28d3-fd7b-58d2-08e5-cead93a397de@jkqxz.net |
|---|---|
| State | New |
| Headers | show |
On Fri, Nov 24, 2017 at 12:36:09PM +0000, Mark Thompson wrote: > This was added for compatibility with libav, by leaving a space for > formats added in libav to be merged. Since that feature has been > removed, we don't need a gap here. > --- > Should be applied before the unstable ABI period ends. > > > libavutil/pixfmt.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h > index 4c530fe..e184a56 100644 > --- a/libavutil/pixfmt.h > +++ b/libavutil/pixfmt.h > @@ -230,7 +230,7 @@ enum AVPixelFormat { > */ > AV_PIX_FMT_CUDA, > > - AV_PIX_FMT_0RGB=0x123+4,///< packed RGB 8:8:8, 32bpp, XRGBXRGB... X=unused/undefined > + AV_PIX_FMT_0RGB, ///< packed RGB 8:8:8, 32bpp, XRGBXRGB... X=unused/undefined > AV_PIX_FMT_RGB0, ///< packed RGB 8:8:8, 32bpp, RGBXRGBX... X=unused/undefined > AV_PIX_FMT_0BGR, ///< packed BGR 8:8:8, 32bpp, XBGRXBGR... X=unused/undefined > AV_PIX_FMT_BGR0, ///< packed BGR 8:8:8, 32bpp, BGRXBGRX... X=unused/undefined LGTM please bump the micro version so this is not totally stealthy happening in the exact same version thx [...]
diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 4c530fe..e184a56 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -230,7 +230,7 @@ enum AVPixelFormat { */ AV_PIX_FMT_CUDA, - AV_PIX_FMT_0RGB=0x123+4,///< packed RGB 8:8:8, 32bpp, XRGBXRGB... X=unused/undefined + AV_PIX_FMT_0RGB, ///< packed RGB 8:8:8, 32bpp, XRGBXRGB... X=unused/undefined AV_PIX_FMT_RGB0, ///< packed RGB 8:8:8, 32bpp, RGBXRGBX... X=unused/undefined AV_PIX_FMT_0BGR, ///< packed BGR 8:8:8, 32bpp, XBGRXBGR... X=unused/undefined AV_PIX_FMT_BGR0, ///< packed BGR 8:8:8, 32bpp, BGRXBGRX... X=unused/undefined