mp3_afh.c: Mark frequencies, bitrate and frame_size_index arrays const

[paraslash.git] / mp3_afh.c

diff --git a/mp3_afh.c b/mp3_afh.c
index 83678389a8c21f211f2f55dea9157eb89412e1ca..7146124803e6c13420e404df919090cb4f556940 100644 (file)
--- a/mp3_afh.c
+++ b/mp3_afh.c
@@ -70,7 +70,6 @@ struct id3tag {
 };
 
 struct mp3info {
-       char *filename;
        struct mp3header header;
        int id3_isvalid;
        struct id3tag id3;
@@ -81,13 +80,13 @@ struct mp3info {
 };
 
 /** \endcond */
-static int frequencies[3][4] = {
+static const int frequencies[3][4] = {
        {22050,24000,16000,50000}, /* MPEG 2.0 */
        {44100,48000,32000,50000}, /* MPEG 1.0 */
        {11025,12000,8000,50000} /* MPEG 2.5 */
 };
 
-static int mp3info_bitrate[2][3][14] = {
+static const int mp3info_bitrate[2][3][14] = {
 { /* MPEG 2.0 */
        {32,48,56,64,80,96,112,128,144,160,176,192,224,256}, /* layer 1 */
        {8,16,24,32,40,48,56,64,80,96,112,128,144,160}, /* layer 2 */
@@ -101,7 +100,7 @@ static int mp3info_bitrate[2][3][14] = {
 }
 };
 
-static int frame_size_index[] = {24000, 72000, 72000};
+static const int frame_size_index[] = {24000, 72000, 72000};
 static const char *mode_text[] = {"stereo", "joint stereo", "dual channel", "mono", "invalid"};
 
 static FILE *infile;
@@ -191,8 +190,7 @@ static int compare_headers(struct mp3header *h1,struct mp3header *h2)
                        (h1->original == h2->original) &&
                        (h1->emphasis == h2->emphasis))
                return 1;
-       else
-               return 0;
+       return 0;
 }
 
 /**