generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/oggparseflac: fix handling of old flac in ogg

Browse Source 
Improves handling of the file in Ticket1617

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-10-07 01:12:23 +02:00
parent 630c005b87
commit 8f2386b589
1 changed files with 22 additions and 1 deletions

23
libavformat/oggparseflac.c

@ -78,11 +78,32 @@ flac_header (AVFormatContext * s, int idx)
static int static int
old_flac_header (AVFormatContext * s, int idx) old_flac_header (AVFormatContext * s, int idx)
{ {
struct ogg *ogg = s->priv_data;
AVStream *st = s->streams[idx]; AVStream *st = s->streams[idx];
struct ogg_stream *os = ogg->streams + idx;
AVCodecParserContext *parser = av_parser_init(AV_CODEC_ID_FLAC);
int size;
uint8_t *data;
if (!parser)
return -1;
st->codec->codec_type = AVMEDIA_TYPE_AUDIO; st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
st->codec->codec_id = AV_CODEC_ID_FLAC; st->codec->codec_id = AV_CODEC_ID_FLAC;
return 0; parser->flags = PARSER_FLAG_COMPLETE_FRAMES;
av_parser_parse2(parser, st->codec,
&data, &size, os->buf + os->pstart, os->psize,
AV_NOPTS_VALUE, AV_NOPTS_VALUE, -1);
av_parser_close(parser);
if (st->codec->sample_rate) {
avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
return 0;
}
return 1;
} }
const struct ogg_codec ff_flac_codec = { const struct ogg_codec ff_flac_codec = {