comparison raw.c @ 4285:d8803d0a4274 libavformat

Handle ID3v2 tags in raw FLAC streams by skipping them. Patch by David DeHaven (dave sagetv com)

4284:40c9bef5b4e2

        return AVERROR(ENOMEM);
    st->codec->codec_type = CODEC_TYPE_AUDIO;
    st->codec->codec_id = s->iformat->value;
    st->need_parsing = AVSTREAM_PARSE_FULL;
    /* the parameters will be extracted from the compressed bitstream */
    return 0;
}

/* MPEG-1/H.263 input */
static int video_read_header(AVFormatContext *s,

#endif

#if CONFIG_FLAC_DEMUXER
static int flac_probe(AVProbeData *p)
{
    if(memcmp(p->buf, "fLaC", 4)) return 0;
    else                          return AVPROBE_SCORE_MAX / 2;
}
#endif

#if CONFIG_AAC_DEMUXER

4285:d8803d0a4274

        return AVERROR(ENOMEM);
    st->codec->codec_type = CODEC_TYPE_AUDIO;
    st->codec->codec_id = s->iformat->value;
    st->need_parsing = AVSTREAM_PARSE_FULL;
    /* the parameters will be extracted from the compressed bitstream */

    if(st->codec->codec_id == CODEC_ID_FLAC) {
        /* skip ID3v2 header if found */
        uint8_t buf[ID3v2_HEADER_SIZE];
        int ret = get_buffer(s->pb, buf, ID3v2_HEADER_SIZE);
        if (ret == ID3v2_HEADER_SIZE && ff_id3v2_match(buf)) {
            int len = ff_id3v2_tag_len(buf);
            url_fseek(s->pb, len - ID3v2_HEADER_SIZE, SEEK_CUR);
        } else {
            url_fseek(s->pb, 0, SEEK_SET);
        }
    }
    return 0;
}

/* MPEG-1/H.263 input */
static int video_read_header(AVFormatContext *s,

#endif

#if CONFIG_FLAC_DEMUXER
static int flac_probe(AVProbeData *p)
{
    uint8_t *bufptr = p->buf;

    if(ff_id3v2_match(bufptr))
        bufptr += ff_id3v2_tag_len(bufptr);

    if(memcmp(bufptr, "fLaC", 4)) return 0;
    else                          return AVPROBE_SCORE_MAX / 2;
}
#endif

#if CONFIG_AAC_DEMUXER