videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

avformat/flacdec: use av_packet_alloc() to allocate packets 

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2021-01-29 10:20:21 -03:00
parent 453021c74e
commit 83a320226c
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavformat/flacdec.c
View File

@ -259,7 +259,7 @@ static int flac_probe(const AVProbeData *p)
static av_unused int64_t flac_read_timestamp(AVFormatContext *s, int stream_index,
int64_t *ppos, int64_t pos_limit)
{
AVPacket pkt;
AVPacket *pkt = s->internal->parse_pkt;
AVStream *st = s->streams[stream_index];
AVCodecParserContext *parser;
int ret;
@ -268,7 +268,6 @@ static av_unused int64_t flac_read_timestamp(AVFormatContext *s, int stream_inde
if (avio_seek(s->pb, *ppos, SEEK_SET) < 0)
return AV_NOPTS_VALUE;
av_init_packet(&pkt);
parser = av_parser_init(st->codecpar->codec_id);
if (!parser){
return AV_NOPTS_VALUE;
@ -279,20 +278,20 @@ static av_unused int64_t flac_read_timestamp(AVFormatContext *s, int stream_inde
uint8_t *data;
int size;
ret = ff_raw_read_partial_packet(s, &pkt);
ret = ff_raw_read_partial_packet(s, pkt);
if (ret < 0){
if (ret == AVERROR(EAGAIN))
continue;
else {
av_packet_unref(&pkt);
av_assert1(!pkt.size);
av_packet_unref(pkt);
av_assert1(!pkt->size);
}
}
av_parser_parse2(parser, st->internal->avctx,
&data, &size, pkt.data, pkt.size,
pkt.pts, pkt.dts, *ppos);
&data, &size, pkt->data, pkt->size,
pkt->pts, pkt->dts, *ppos);
av_packet_unref(&pkt);
av_packet_unref(pkt);
if (size) {
if (parser->pts != AV_NOPTS_VALUE){
// seeking may not have started from beginning of a frame