From: Clément Bœsch <clement.boesch@smartjog.com>
Date: Tue, 14 Feb 2012 11:07:31 +0000 (+0100)
Subject: audioconvert: consistent use of FF_ARRAY_ELEMS for channel_layout_map.
X-Git-Tag: android-x86-4.4-r1~13391
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=95317821ea6d0788a71a3fa9321afbdb87ac1c82;p=android-x86%2Fexternal-ffmpeg.git

audioconvert: consistent use of FF_ARRAY_ELEMS for channel_layout_map.
---

diff --git a/libavutil/audioconvert.c b/libavutil/audioconvert.c
index dd4c330907..28f5fcb115 100644
--- a/libavutil/audioconvert.c
+++ b/libavutil/audioconvert.c
@@ -74,7 +74,6 @@ static const struct {
     { "7.1",         8,  AV_CH_LAYOUT_7POINT1 },
     { "7.1(wide)",   8,  AV_CH_LAYOUT_7POINT1_WIDE },
     { "downmix",     2,  AV_CH_LAYOUT_STEREO_DOWNMIX, },
-    { 0 }
 };
 
 static uint64_t get_channel_layout_single(const char *name, int name_len)
@@ -83,7 +82,7 @@ static uint64_t get_channel_layout_single(const char *name, int name_len)
     char *end;
     int64_t layout;
 
-    for (i = 0; i < FF_ARRAY_ELEMS(channel_layout_map) - 1; i++) {
+    for (i = 0; i < FF_ARRAY_ELEMS(channel_layout_map); i++) {
         if (strlen(channel_layout_map[i].name) == name_len &&
             !memcmp(channel_layout_map[i].name, name, name_len))
             return channel_layout_map[i].layout;
@@ -127,7 +126,7 @@ void av_get_channel_layout_string(char *buf, int buf_size,
     if (nb_channels <= 0)
         nb_channels = av_get_channel_layout_nb_channels(channel_layout);
 
-    for (i = 0; channel_layout_map[i].name; i++)
+    for (i = 0; i < FF_ARRAY_ELEMS(channel_layout_map); i++)
         if (nb_channels    == channel_layout_map[i].nb_channels &&
             channel_layout == channel_layout_map[i].layout) {
             av_strlcpy(buf, channel_layout_map[i].name, buf_size);
@@ -164,7 +163,7 @@ int av_get_channel_layout_nb_channels(uint64_t channel_layout)
 
 int64_t av_get_default_channel_layout(int nb_channels) {
     int i;
-    for (i = 0; channel_layout_map[i].name; i++)
+    for (i = 0; i < FF_ARRAY_ELEMS(channel_layout_map); i++)
         if (nb_channels == channel_layout_map[i].nb_channels)
             return channel_layout_map[i].layout;
     return 0;