summaryrefslogtreecommitdiff
path: root/libavformat/flacenc.c
diff options
context:
space:
mode:
Diffstat (limited to 'libavformat/flacenc.c')
-rw-r--r--libavformat/flacenc.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/libavformat/flacenc.c b/libavformat/flacenc.c
index 1aae0c97e0..42c1efec54 100644
--- a/libavformat/flacenc.c
+++ b/libavformat/flacenc.c
@@ -331,8 +331,6 @@ static int flac_write_trailer(struct AVFormatContext *s)
AVIOContext *pb = s->pb;
int64_t file_size;
FlacMuxerContext *c = s->priv_data;
- uint8_t *streaminfo = c->streaminfo ? c->streaminfo :
- s->streams[c->audio_stream_idx]->codecpar->extradata;
if (c->waiting_pics) {
av_log(s, AV_LOG_WARNING, "No packets were sent for some of the "
@@ -340,14 +338,14 @@ static int flac_write_trailer(struct AVFormatContext *s)
flac_queue_flush(s);
}
- if (!c->write_header || !streaminfo)
+ if (!c->write_header || !c->streaminfo)
return 0;
if (pb->seekable & AVIO_SEEKABLE_NORMAL) {
/* rewrite the STREAMINFO header block data */
file_size = avio_tell(pb);
avio_seek(pb, 8, SEEK_SET);
- avio_write(pb, streaminfo, FLAC_STREAMINFO_SIZE);
+ avio_write(pb, c->streaminfo, FLAC_STREAMINFO_SIZE);
avio_seek(pb, file_size, SEEK_SET);
} else {
av_log(s, AV_LOG_WARNING, "unable to rewrite FLAC header.\n");