Revision e4d2d8c5

View differences:

libavformat/flacdec.c
113 113
            }
114 114
            /* process supported blocks other than STREAMINFO */
115 115
            if (metadata_type == FLAC_METADATA_TYPE_VORBIS_COMMENT) {
116
                if (vorbis_comment(s, buffer, metadata_size)) {
116
                if (ff_vorbis_comment(s, buffer, metadata_size)) {
117 117
                    av_log(s, AV_LOG_WARNING, "error parsing VorbisComment metadata\n");
118 118
                }
119 119
            }
libavformat/oggdec.h
115 115

  
116 116
extern const AVMetadataConv ff_vorbiscomment_metadata_conv[];
117 117

  
118
int vorbis_comment(AVFormatContext *ms, uint8_t *buf, int size);
118
int ff_vorbis_comment(AVFormatContext *ms, uint8_t *buf, int size);
119 119

  
120 120
static inline int
121 121
ogg_find_stream (struct ogg * ogg, int serial)
libavformat/oggparseflac.c
68 68
        st->time_base.num = 1;
69 69
        st->time_base.den = st->codec->sample_rate;
70 70
    } else if (mdt == FLAC_METADATA_TYPE_VORBIS_COMMENT) {
71
        vorbis_comment (s, os->buf + os->pstart + 4, os->psize - 4);
71
        ff_vorbis_comment (s, os->buf + os->pstart + 4, os->psize - 4);
72 72
    }
73 73

  
74 74
    return 1;
libavformat/oggparsespeex.c
75 75
        st->time_base.num = 1;
76 76
        st->time_base.den = st->codec->sample_rate;
77 77
    } else
78
        vorbis_comment(s, p, os->psize);
78
        ff_vorbis_comment(s, p, os->psize);
79 79

  
80 80
    spxp->seq++;
81 81
    return 1;
libavformat/oggparsetheora.c
109 109
        st->need_parsing = AVSTREAM_PARSE_HEADERS;
110 110

  
111 111
    } else if (os->buf[os->pstart] == 0x83) {
112
        vorbis_comment (s, os->buf + os->pstart + 7, os->psize - 8);
112
        ff_vorbis_comment (s, os->buf + os->pstart + 7, os->psize - 8);
113 113
    }
114 114

  
115 115
    st->codec->extradata = av_realloc (st->codec->extradata,
libavformat/oggparsevorbis.c
42 42
};
43 43

  
44 44
int
45
vorbis_comment(AVFormatContext * as, uint8_t *buf, int size)
45
ff_vorbis_comment(AVFormatContext * as, uint8_t *buf, int size)
46 46
{
47 47
    const uint8_t *p = buf;
48 48
    const uint8_t *end = buf + size;
......
220 220
        st->time_base.den = st->codec->sample_rate;
221 221
    } else if (os->buf[os->pstart] == 3) {
222 222
        if (os->psize > 8)
223
            vorbis_comment (s, os->buf + os->pstart + 7, os->psize - 8);
223
            ff_vorbis_comment (s, os->buf + os->pstart + 7, os->psize - 8);
224 224
    } else {
225 225
        st->codec->extradata_size =
226 226
            fixup_vorbis_headers(s, priv, &st->codec->extradata);

Also available in: Unified diff