Revision 75411182

View differences:

libavformat/Makefile
96 96
OBJS-$(CONFIG_MOV_DEMUXER)               += mov.o riff.o isom.o
97 97
OBJS-$(CONFIG_MOV_MUXER)                 += movenc.o riff.o isom.o avc.o
98 98
OBJS-$(CONFIG_MP2_MUXER)                 += mp3.o
99
OBJS-$(CONFIG_MP3_DEMUXER)               += mp3.o id3v2.o
99
OBJS-$(CONFIG_MP3_DEMUXER)               += mp3.o id3v1.o id3v2.o
100 100
OBJS-$(CONFIG_MP3_MUXER)                 += mp3.o
101 101
OBJS-$(CONFIG_MP4_MUXER)                 += movenc.o riff.o isom.o avc.o
102 102
OBJS-$(CONFIG_MPC_DEMUXER)               += mpc.o id3v2.o
libavformat/id3v1.c
1
/*
2
 * ID3v1 header parser
3
 * Copyright (c) 2003 Fabrice Bellard
4
 *
5
 * This file is part of FFmpeg.
6
 *
7
 * FFmpeg is free software; you can redistribute it and/or
8
 * modify it under the terms of the GNU Lesser General Public
9
 * License as published by the Free Software Foundation; either
10
 * version 2.1 of the License, or (at your option) any later version.
11
 *
12
 * FFmpeg is distributed in the hope that it will be useful,
13
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
15
 * Lesser General Public License for more details.
16
 *
17
 * You should have received a copy of the GNU Lesser General Public
18
 * License along with FFmpeg; if not, write to the Free Software
19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20
 */
21

  
22
#include "id3v1.h"
23

  
24
const char *ff_id3v1_genre_str[ID3v1_GENRE_MAX + 1] = {
25
    [0] = "Blues",
26
    [1] = "Classic Rock",
27
    [2] = "Country",
28
    [3] = "Dance",
29
    [4] = "Disco",
30
    [5] = "Funk",
31
    [6] = "Grunge",
32
    [7] = "Hip-Hop",
33
    [8] = "Jazz",
34
    [9] = "Metal",
35
    [10] = "New Age",
36
    [11] = "Oldies",
37
    [12] = "Other",
38
    [13] = "Pop",
39
    [14] = "R&B",
40
    [15] = "Rap",
41
    [16] = "Reggae",
42
    [17] = "Rock",
43
    [18] = "Techno",
44
    [19] = "Industrial",
45
    [20] = "Alternative",
46
    [21] = "Ska",
47
    [22] = "Death Metal",
48
    [23] = "Pranks",
49
    [24] = "Soundtrack",
50
    [25] = "Euro-Techno",
51
    [26] = "Ambient",
52
    [27] = "Trip-Hop",
53
    [28] = "Vocal",
54
    [29] = "Jazz+Funk",
55
    [30] = "Fusion",
56
    [31] = "Trance",
57
    [32] = "Classical",
58
    [33] = "Instrumental",
59
    [34] = "Acid",
60
    [35] = "House",
61
    [36] = "Game",
62
    [37] = "Sound Clip",
63
    [38] = "Gospel",
64
    [39] = "Noise",
65
    [40] = "AlternRock",
66
    [41] = "Bass",
67
    [42] = "Soul",
68
    [43] = "Punk",
69
    [44] = "Space",
70
    [45] = "Meditative",
71
    [46] = "Instrumental Pop",
72
    [47] = "Instrumental Rock",
73
    [48] = "Ethnic",
74
    [49] = "Gothic",
75
    [50] = "Darkwave",
76
    [51] = "Techno-Industrial",
77
    [52] = "Electronic",
78
    [53] = "Pop-Folk",
79
    [54] = "Eurodance",
80
    [55] = "Dream",
81
    [56] = "Southern Rock",
82
    [57] = "Comedy",
83
    [58] = "Cult",
84
    [59] = "Gangsta",
85
    [60] = "Top 40",
86
    [61] = "Christian Rap",
87
    [62] = "Pop/Funk",
88
    [63] = "Jungle",
89
    [64] = "Native American",
90
    [65] = "Cabaret",
91
    [66] = "New Wave",
92
    [67] = "Psychadelic",
93
    [68] = "Rave",
94
    [69] = "Showtunes",
95
    [70] = "Trailer",
96
    [71] = "Lo-Fi",
97
    [72] = "Tribal",
98
    [73] = "Acid Punk",
99
    [74] = "Acid Jazz",
100
    [75] = "Polka",
101
    [76] = "Retro",
102
    [77] = "Musical",
103
    [78] = "Rock & Roll",
104
    [79] = "Hard Rock",
105
    [80] = "Folk",
106
    [81] = "Folk-Rock",
107
    [82] = "National Folk",
108
    [83] = "Swing",
109
    [84] = "Fast Fusion",
110
    [85] = "Bebob",
111
    [86] = "Latin",
112
    [87] = "Revival",
113
    [88] = "Celtic",
114
    [89] = "Bluegrass",
115
    [90] = "Avantgarde",
116
    [91] = "Gothic Rock",
117
    [92] = "Progressive Rock",
118
    [93] = "Psychedelic Rock",
119
    [94] = "Symphonic Rock",
120
    [95] = "Slow Rock",
121
    [96] = "Big Band",
122
    [97] = "Chorus",
123
    [98] = "Easy Listening",
124
    [99] = "Acoustic",
125
    [100] = "Humour",
126
    [101] = "Speech",
127
    [102] = "Chanson",
128
    [103] = "Opera",
129
    [104] = "Chamber Music",
130
    [105] = "Sonata",
131
    [106] = "Symphony",
132
    [107] = "Booty Bass",
133
    [108] = "Primus",
134
    [109] = "Porn Groove",
135
    [110] = "Satire",
136
    [111] = "Slow Jam",
137
    [112] = "Club",
138
    [113] = "Tango",
139
    [114] = "Samba",
140
    [115] = "Folklore",
141
    [116] = "Ballad",
142
    [117] = "Power Ballad",
143
    [118] = "Rhythmic Soul",
144
    [119] = "Freestyle",
145
    [120] = "Duet",
146
    [121] = "Punk Rock",
147
    [122] = "Drum Solo",
148
    [123] = "A capella",
149
    [124] = "Euro-House",
150
    [125] = "Dance Hall",
151
};
libavformat/id3v1.h
1
/*
2
 * ID3v1 header parser
3
 * Copyright (c) 2003 Fabrice Bellard
4
 *
5
 * This file is part of FFmpeg.
6
 *
7
 * FFmpeg is free software; you can redistribute it and/or
8
 * modify it under the terms of the GNU Lesser General Public
9
 * License as published by the Free Software Foundation; either
10
 * version 2.1 of the License, or (at your option) any later version.
11
 *
12
 * FFmpeg is distributed in the hope that it will be useful,
13
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
15
 * Lesser General Public License for more details.
16
 *
17
 * You should have received a copy of the GNU Lesser General Public
18
 * License along with FFmpeg; if not, write to the Free Software
19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20
 */
21

  
22
#ifndef AVFORMAT_ID3V1_H
23
#define AVFORMAT_ID3V1_H
24

  
25
#define ID3v1_TAG_SIZE 128
26

  
27
#define ID3v1_GENRE_MAX 125
28

  
29
/**
30
 * ID3v1 genres
31
 */
32
extern const char *ff_id3v1_genre_str[ID3v1_GENRE_MAX + 1];
33

  
34
#endif /* AVFORMAT_ID3V1_H */
35

  
libavformat/id3v2.c
20 20
 */
21 21

  
22 22
#include "id3v2.h"
23
#include "id3v1.h"
24
#include "libavutil/avstring.h"
23 25

  
24 26
int ff_id3v2_match(const uint8_t *buf)
25 27
{
......
45 47
        len += ID3v2_HEADER_SIZE;
46 48
    return len;
47 49
}
50

  
51
static unsigned int get_size(ByteIOContext *s, int len)
52
{
53
    int v=0;
54
    while(len--)
55
        v= (v<<7) + (get_byte(s)&0x7F);
56
    return v;
57
}
58

  
59
static void read_ttag(AVFormatContext *s, int taglen, const char *key)
60
{
61
    char *q, dst[512];
62
    int len, dstlen = sizeof(dst) - 1;
63
    unsigned genre;
64

  
65
    dst[0]= 0;
66
    if(taglen < 1)
67
        return;
68

  
69
    taglen--; /* account for encoding type byte */
70

  
71
    switch(get_byte(s->pb)) { /* encoding type */
72

  
73
    case 0:  /* ISO-8859-1 (0 - 255 maps directly into unicode) */
74
        q = dst;
75
        while(taglen--) {
76
            uint8_t tmp;
77
            PUT_UTF8(get_byte(s->pb), tmp, if (q - dst < dstlen - 1) *q++ = tmp;)
78
        }
79
        *q = '\0';
80
        break;
81

  
82
    case 3:  /* UTF-8 */
83
        len = FFMIN(taglen, dstlen-1);
84
        get_buffer(s->pb, dst, len);
85
        dst[len] = 0;
86
        break;
87
    }
88

  
89
    if (!strcmp(key, "genre")
90
        && (sscanf(dst, "(%d)", &genre) == 1 || sscanf(dst, "%d", &genre) == 1)
91
        && genre <= ID3v1_GENRE_MAX)
92
        av_strlcpy(dst, ff_id3v1_genre_str[genre], sizeof(dst));
93

  
94
    if (*dst)
95
        av_metadata_set(&s->metadata, key, dst);
96
}
97

  
98
void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t flags)
99
{
100
    int isv34, tlen;
101
    uint32_t tag;
102
    int64_t next;
103
    int taghdrlen;
104
    const char *reason;
105

  
106
    switch(version) {
107
    case 2:
108
        if(flags & 0x40) {
109
            reason = "compression";
110
            goto error;
111
        }
112
        isv34 = 0;
113
        taghdrlen = 6;
114
        break;
115

  
116
    case 3:
117
    case 4:
118
        isv34 = 1;
119
        taghdrlen = 10;
120
        break;
121

  
122
    default:
123
        reason = "version";
124
        goto error;
125
    }
126

  
127
    if(flags & 0x80) {
128
        reason = "unsynchronization";
129
        goto error;
130
    }
131

  
132
    if(isv34 && flags & 0x40) /* Extended header present, just skip over it */
133
        url_fskip(s->pb, get_size(s->pb, 4));
134

  
135
    while(len >= taghdrlen) {
136
        if(isv34) {
137
            tag  = get_be32(s->pb);
138
            tlen = get_size(s->pb, 4);
139
            get_be16(s->pb); /* flags */
140
        } else {
141
            tag  = get_be24(s->pb);
142
            tlen = get_size(s->pb, 3);
143
        }
144
        len -= taghdrlen + tlen;
145

  
146
        if(len < 0)
147
            break;
148

  
149
        next = url_ftell(s->pb) + tlen;
150

  
151
        switch(tag) {
152
        case MKBETAG('T', 'I', 'T', '2'):
153
        case MKBETAG(0,   'T', 'T', '2'):
154
            read_ttag(s, tlen, "title");
155
            break;
156
        case MKBETAG('T', 'P', 'E', '1'):
157
        case MKBETAG(0,   'T', 'P', '1'):
158
            read_ttag(s, tlen, "author");
159
            break;
160
        case MKBETAG('T', 'A', 'L', 'B'):
161
        case MKBETAG(0,   'T', 'A', 'L'):
162
            read_ttag(s, tlen, "album");
163
            break;
164
        case MKBETAG('T', 'C', 'O', 'N'):
165
        case MKBETAG(0,   'T', 'C', 'O'):
166
            read_ttag(s, tlen, "genre");
167
            break;
168
        case MKBETAG('T', 'C', 'O', 'P'):
169
        case MKBETAG(0,   'T', 'C', 'R'):
170
            read_ttag(s, tlen, "copyright");
171
            break;
172
        case MKBETAG('T', 'R', 'C', 'K'):
173
        case MKBETAG(0,   'T', 'R', 'K'):
174
            read_ttag(s, tlen, "track");
175
            break;
176
        case 0:
177
            /* padding, skip to end */
178
            url_fskip(s->pb, len);
179
            len = 0;
180
            continue;
181
        }
182
        /* Skip to end of tag */
183
        url_fseek(s->pb, next, SEEK_SET);
184
    }
185

  
186
    if(version == 4 && flags & 0x10) /* Footer preset, always 10 bytes, skip over it */
187
        url_fskip(s->pb, 10);
188
    return;
189

  
190
  error:
191
    av_log(s, AV_LOG_INFO, "ID3v2.%d tag skipped, cannot handle %s\n", version, reason);
192
    url_fskip(s->pb, len);
193
}
194

  
libavformat/id3v2.h
23 23
#define AVFORMAT_ID3V2_H
24 24

  
25 25
#include <stdint.h>
26
#include "avformat.h"
26 27

  
27 28
#define ID3v2_HEADER_SIZE 10
28 29

  
......
39 40
 */
40 41
int ff_id3v2_tag_len(const uint8_t *buf);
41 42

  
43
/**
44
 * ID3v2 parser
45
 * Handles ID3v2.2, 2.3 and 2.4.
46
 */
47
void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t flags);
48

  
42 49
#endif /* AVFORMAT_ID3V2_H */
libavformat/mp3.c
25 25
#include "libavcodec/mpegaudiodecheader.h"
26 26
#include "avformat.h"
27 27
#include "id3v2.h"
28

  
29
#define ID3v1_TAG_SIZE 128
30

  
31
#define ID3v1_GENRE_MAX 125
32

  
33
static const char * const id3v1_genre_str[ID3v1_GENRE_MAX + 1] = {
34
    [0] = "Blues",
35
    [1] = "Classic Rock",
36
    [2] = "Country",
37
    [3] = "Dance",
38
    [4] = "Disco",
39
    [5] = "Funk",
40
    [6] = "Grunge",
41
    [7] = "Hip-Hop",
42
    [8] = "Jazz",
43
    [9] = "Metal",
44
    [10] = "New Age",
45
    [11] = "Oldies",
46
    [12] = "Other",
47
    [13] = "Pop",
48
    [14] = "R&B",
49
    [15] = "Rap",
50
    [16] = "Reggae",
51
    [17] = "Rock",
52
    [18] = "Techno",
53
    [19] = "Industrial",
54
    [20] = "Alternative",
55
    [21] = "Ska",
56
    [22] = "Death Metal",
57
    [23] = "Pranks",
58
    [24] = "Soundtrack",
59
    [25] = "Euro-Techno",
60
    [26] = "Ambient",
61
    [27] = "Trip-Hop",
62
    [28] = "Vocal",
63
    [29] = "Jazz+Funk",
64
    [30] = "Fusion",
65
    [31] = "Trance",
66
    [32] = "Classical",
67
    [33] = "Instrumental",
68
    [34] = "Acid",
69
    [35] = "House",
70
    [36] = "Game",
71
    [37] = "Sound Clip",
72
    [38] = "Gospel",
73
    [39] = "Noise",
74
    [40] = "AlternRock",
75
    [41] = "Bass",
76
    [42] = "Soul",
77
    [43] = "Punk",
78
    [44] = "Space",
79
    [45] = "Meditative",
80
    [46] = "Instrumental Pop",
81
    [47] = "Instrumental Rock",
82
    [48] = "Ethnic",
83
    [49] = "Gothic",
84
    [50] = "Darkwave",
85
    [51] = "Techno-Industrial",
86
    [52] = "Electronic",
87
    [53] = "Pop-Folk",
88
    [54] = "Eurodance",
89
    [55] = "Dream",
90
    [56] = "Southern Rock",
91
    [57] = "Comedy",
92
    [58] = "Cult",
93
    [59] = "Gangsta",
94
    [60] = "Top 40",
95
    [61] = "Christian Rap",
96
    [62] = "Pop/Funk",
97
    [63] = "Jungle",
98
    [64] = "Native American",
99
    [65] = "Cabaret",
100
    [66] = "New Wave",
101
    [67] = "Psychadelic",
102
    [68] = "Rave",
103
    [69] = "Showtunes",
104
    [70] = "Trailer",
105
    [71] = "Lo-Fi",
106
    [72] = "Tribal",
107
    [73] = "Acid Punk",
108
    [74] = "Acid Jazz",
109
    [75] = "Polka",
110
    [76] = "Retro",
111
    [77] = "Musical",
112
    [78] = "Rock & Roll",
113
    [79] = "Hard Rock",
114
    [80] = "Folk",
115
    [81] = "Folk-Rock",
116
    [82] = "National Folk",
117
    [83] = "Swing",
118
    [84] = "Fast Fusion",
119
    [85] = "Bebob",
120
    [86] = "Latin",
121
    [87] = "Revival",
122
    [88] = "Celtic",
123
    [89] = "Bluegrass",
124
    [90] = "Avantgarde",
125
    [91] = "Gothic Rock",
126
    [92] = "Progressive Rock",
127
    [93] = "Psychedelic Rock",
128
    [94] = "Symphonic Rock",
129
    [95] = "Slow Rock",
130
    [96] = "Big Band",
131
    [97] = "Chorus",
132
    [98] = "Easy Listening",
133
    [99] = "Acoustic",
134
    [100] = "Humour",
135
    [101] = "Speech",
136
    [102] = "Chanson",
137
    [103] = "Opera",
138
    [104] = "Chamber Music",
139
    [105] = "Sonata",
140
    [106] = "Symphony",
141
    [107] = "Booty Bass",
142
    [108] = "Primus",
143
    [109] = "Porn Groove",
144
    [110] = "Satire",
145
    [111] = "Slow Jam",
146
    [112] = "Club",
147
    [113] = "Tango",
148
    [114] = "Samba",
149
    [115] = "Folklore",
150
    [116] = "Ballad",
151
    [117] = "Power Ballad",
152
    [118] = "Rhythmic Soul",
153
    [119] = "Freestyle",
154
    [120] = "Duet",
155
    [121] = "Punk Rock",
156
    [122] = "Drum Solo",
157
    [123] = "A capella",
158
    [124] = "Euro-House",
159
    [125] = "Dance Hall",
160
};
161

  
162
static unsigned int id3v2_get_size(ByteIOContext *s, int len)
163
{
164
    int v=0;
165
    while(len--)
166
        v= (v<<7) + (get_byte(s)&0x7F);
167
    return v;
168
}
169

  
170
static void id3v2_read_ttag(AVFormatContext *s, int taglen, const char *key)
171
{
172
    char *q, dst[512];
173
    int len, dstlen = sizeof(dst) - 1;
174
    unsigned genre;
175

  
176
    dst[0]= 0;
177
    if(taglen < 1)
178
        return;
179

  
180
    taglen--; /* account for encoding type byte */
181

  
182
    switch(get_byte(s->pb)) { /* encoding type */
183

  
184
    case 0:  /* ISO-8859-1 (0 - 255 maps directly into unicode) */
185
        q = dst;
186
        while(taglen--) {
187
            uint8_t tmp;
188
            PUT_UTF8(get_byte(s->pb), tmp, if (q - dst < dstlen - 1) *q++ = tmp;)
189
        }
190
        *q = '\0';
191
        break;
192

  
193
    case 3:  /* UTF-8 */
194
        len = FFMIN(taglen, dstlen-1);
195
        get_buffer(s->pb, dst, len);
196
        dst[len] = 0;
197
        break;
198
    }
199

  
200
    if (!strcmp(key, "genre")
201
        && (sscanf(dst, "(%d)", &genre) == 1 || sscanf(dst, "%d", &genre) == 1)
202
        && genre <= ID3v1_GENRE_MAX)
203
        av_strlcpy(dst, id3v1_genre_str[genre], sizeof(dst));
204

  
205
    if (*dst)
206
        av_metadata_set(&s->metadata, key, dst);
207
}
208

  
209
/**
210
 * ID3v2 parser
211
 *
212
 * Handles ID3v2.2, 2.3 and 2.4.
213
 *
214
 */
215

  
216
static void id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t flags)
217
{
218
    int isv34, tlen;
219
    uint32_t tag;
220
    int64_t next;
221
    int taghdrlen;
222
    const char *reason;
223

  
224
    switch(version) {
225
    case 2:
226
        if(flags & 0x40) {
227
            reason = "compression";
228
            goto error;
229
        }
230
        isv34 = 0;
231
        taghdrlen = 6;
232
        break;
233

  
234
    case 3:
235
    case 4:
236
        isv34 = 1;
237
        taghdrlen = 10;
238
        break;
239

  
240
    default:
241
        reason = "version";
242
        goto error;
243
    }
244

  
245
    if(flags & 0x80) {
246
        reason = "unsynchronization";
247
        goto error;
248
    }
249

  
250
    if(isv34 && flags & 0x40) /* Extended header present, just skip over it */
251
        url_fskip(s->pb, id3v2_get_size(s->pb, 4));
252

  
253
    while(len >= taghdrlen) {
254
        if(isv34) {
255
            tag  = get_be32(s->pb);
256
            tlen = id3v2_get_size(s->pb, 4);
257
            get_be16(s->pb); /* flags */
258
        } else {
259
            tag  = get_be24(s->pb);
260
            tlen = id3v2_get_size(s->pb, 3);
261
        }
262
        len -= taghdrlen + tlen;
263

  
264
        if(len < 0)
265
            break;
266

  
267
        next = url_ftell(s->pb) + tlen;
268

  
269
        switch(tag) {
270
        case MKBETAG('T', 'I', 'T', '2'):
271
        case MKBETAG(0,   'T', 'T', '2'):
272
            id3v2_read_ttag(s, tlen, "title");
273
            break;
274
        case MKBETAG('T', 'P', 'E', '1'):
275
        case MKBETAG(0,   'T', 'P', '1'):
276
            id3v2_read_ttag(s, tlen, "author");
277
            break;
278
        case MKBETAG('T', 'A', 'L', 'B'):
279
        case MKBETAG(0,   'T', 'A', 'L'):
280
            id3v2_read_ttag(s, tlen, "album");
281
            break;
282
        case MKBETAG('T', 'C', 'O', 'N'):
283
        case MKBETAG(0,   'T', 'C', 'O'):
284
            id3v2_read_ttag(s, tlen, "genre");
285
            break;
286
        case MKBETAG('T', 'C', 'O', 'P'):
287
        case MKBETAG(0,   'T', 'C', 'R'):
288
            id3v2_read_ttag(s, tlen, "copyright");
289
            break;
290
        case MKBETAG('T', 'R', 'C', 'K'):
291
        case MKBETAG(0,   'T', 'R', 'K'):
292
            id3v2_read_ttag(s, tlen, "track");
293
            break;
294
        case 0:
295
            /* padding, skip to end */
296
            url_fskip(s->pb, len);
297
            len = 0;
298
            continue;
299
        }
300
        /* Skip to end of tag */
301
        url_fseek(s->pb, next, SEEK_SET);
302
    }
303

  
304
    if(version == 4 && flags & 0x10) /* Footer preset, always 10 bytes, skip over it */
305
        url_fskip(s->pb, 10);
306
    return;
307

  
308
  error:
309
    av_log(s, AV_LOG_INFO, "ID3v2.%d tag skipped, cannot handle %s\n", version, reason);
310
    url_fskip(s->pb, len);
311
}
28
#include "id3v1.h"
312 29

  
313 30
static void id3v1_get_string(AVFormatContext *s, const char *key,
314 31
                             const uint8_t *buf, int buf_size)
......
352 69
    }
353 70
    genre = buf[127];
354 71
    if (genre <= ID3v1_GENRE_MAX)
355
        av_metadata_set(&s->metadata, "genre", id3v1_genre_str[genre]);
72
        av_metadata_set(&s->metadata, "genre", ff_id3v1_genre_str[genre]);
356 73
    return 0;
357 74
}
358 75

  
......
492 209
            ((buf[7] & 0x7f) << 14) |
493 210
            ((buf[8] & 0x7f) << 7) |
494 211
            (buf[9] & 0x7f);
495
        id3v2_parse(s, len, buf[3], buf[5]);
212
        ff_id3v2_parse(s, len, buf[3], buf[5]);
496 213
    } else {
497 214
        url_fseek(s->pb, 0, SEEK_SET);
498 215
    }
......
557 274
    }
558 275
    if ((tag = av_metadata_get(s->metadata, "genre", NULL, 0))) {
559 276
        for(i = 0; i <= ID3v1_GENRE_MAX; i++) {
560
            if (!strcasecmp(tag->value, id3v1_genre_str[i])) {
277
            if (!strcasecmp(tag->value, ff_id3v1_genre_str[i])) {
561 278
                buf[127] = i;
562 279
                count++;
563 280
                break;

Also available in: Unified diff