[FFmpeg-cvslog] swscale/utils: remove access of AV_PIX_FMT_NB

Zhao Zhili git at videolan.org
Tue Dec 31 14:15:17 EET 2019


ffmpeg | branch: master | Zhao Zhili <zhilizhao at tencent.com> | Mon Dec 30 21:54:16 2019 +0800| [1e3e547a5b38d56d1b054078316ff862c7bcbac9] | committer: Michael Niedermayer

swscale/utils: remove access of AV_PIX_FMT_NB

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1e3e547a5b38d56d1b054078316ff862c7bcbac9
---

 libswscale/utils.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libswscale/utils.c b/libswscale/utils.c
index 57c4fd2b0f..c915cf0fca 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -95,7 +95,7 @@ typedef struct FormatEntry {
     uint8_t is_supported_endianness :1;
 } FormatEntry;
 
-static const FormatEntry format_entries[AV_PIX_FMT_NB] = {
+static const FormatEntry format_entries[] = {
     [AV_PIX_FMT_YUV420P]     = { 1, 1 },
     [AV_PIX_FMT_YUYV422]     = { 1, 1 },
     [AV_PIX_FMT_RGB24]       = { 1, 1 },
@@ -270,19 +270,19 @@ static const FormatEntry format_entries[AV_PIX_FMT_NB] = {
 
 int sws_isSupportedInput(enum AVPixelFormat pix_fmt)
 {
-    return (unsigned)pix_fmt < AV_PIX_FMT_NB ?
+    return (unsigned)pix_fmt < FF_ARRAY_ELEMS(format_entries) ?
            format_entries[pix_fmt].is_supported_in : 0;
 }
 
 int sws_isSupportedOutput(enum AVPixelFormat pix_fmt)
 {
-    return (unsigned)pix_fmt < AV_PIX_FMT_NB ?
+    return (unsigned)pix_fmt < FF_ARRAY_ELEMS(format_entries) ?
            format_entries[pix_fmt].is_supported_out : 0;
 }
 
 int sws_isSupportedEndiannessConversion(enum AVPixelFormat pix_fmt)
 {
-    return (unsigned)pix_fmt < AV_PIX_FMT_NB ?
+    return (unsigned)pix_fmt < FF_ARRAY_ELEMS(format_entries) ?
            format_entries[pix_fmt].is_supported_endianness : 0;
 }
 



More information about the ffmpeg-cvslog mailing list