virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Handle ID3v2 tags in raw FLAC streams by skipping them.

Browse Source 
Patch by David DeHaven (dave sagetv com)

Originally committed as revision 16764 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
David DeHaven 2009-01-25 00:16:27 +00:00 committed by Justin Ruggles
parent 9f3d3ecf92
commit 6cde949a20
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavformat/raw.c
View File

@ -289,6 +289,18 @@ static int audio_read_header(AVFormatContext *s,
st->codec->codec_id = s->iformat->value; st->codec->codec_id = s->iformat->value;
st->need_parsing = AVSTREAM_PARSE_FULL; st->need_parsing = AVSTREAM_PARSE_FULL;
/* the parameters will be extracted from the compressed bitstream */ /* 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; return 0;
} }
@ -573,7 +585,12 @@ static int eac3_probe(AVProbeData *p)
#if CONFIG_FLAC_DEMUXER #if CONFIG_FLAC_DEMUXER
static int flac_probe(AVProbeData *p) static int flac_probe(AVProbeData *p)
{ {
if(memcmp(p->buf, "fLaC", 4)) return 0; 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; else return AVPROBE_SCORE_MAX / 2;
} }
#endif #endif