RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/flacenc: Don't allocate updated streaminfo separately 

It is a small buffer of a known, fixed size and so it should simply be
put into the muxer's context.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-04-12 18:23:44 +02:00
parent 9311ece7d3
commit 1d15e4208f
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/flacenc.c
View File

@ -42,7 +42,8 @@ typedef struct FlacMuxerContext {
AVPacketList *queue, *queue_end;
/* updated streaminfo sent by the encoder at the end */
uint8_t *streaminfo;
uint8_t streaminfo[FLAC_STREAMINFO_SIZE];
int updated_streaminfo;
unsigned attached_types;
} FlacMuxerContext;
@ -294,12 +295,8 @@ static int flac_write_audio_packet(struct AVFormatContext *s, AVPacket *pkt)
streaminfo = av_packet_get_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA,
&streaminfo_size);
if (streaminfo && streaminfo_size == FLAC_STREAMINFO_SIZE) {
av_freep(&c->streaminfo);
c->streaminfo = av_malloc(FLAC_STREAMINFO_SIZE);
if (!c->streaminfo)
return AVERROR(ENOMEM);
memcpy(c->streaminfo, streaminfo, FLAC_STREAMINFO_SIZE);
c->updated_streaminfo = 1;
}
if (pkt->size)
@ -338,7 +335,7 @@ static int flac_write_trailer(struct AVFormatContext *s)
flac_queue_flush(s);
}
if (!c->write_header || !c->streaminfo)
if (!c->write_header || !c->updated_streaminfo)
return 0;
if (pb->seekable & AVIO_SEEKABLE_NORMAL) {
@ -359,7 +356,6 @@ static void flac_deinit(struct AVFormatContext *s)
FlacMuxerContext *c = s->priv_data;
ff_packet_list_free(&c->queue, &c->queue_end);
av_freep(&c->streaminfo);
}
static int flac_write_packet(struct AVFormatContext *s, AVPacket *pkt)