summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorZane van Iperen <zane@zanevaniperen.com>2020-09-15 09:22:22 +1000
committerZane van Iperen <zane@zanevaniperen.com>2020-09-16 13:26:06 +1000
commitc79f07cc0c0b15252f13f56d61cf29c0081445b3 (patch)
treed7d8398c2b99a6596705ececcddce8aac536551d /libavformat
parent7cc8a2bb0b39ef8b428ca99d950dd01cff44a2e0 (diff)
avformat/argo_asf: initialise file header inline
Garbage was left-over in the ArgoASFFileHeader::name field if the url was too short. This zero-initialises it. Signed-off-by: Zane van Iperen <zane@zanevaniperen.com>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/argo_asf.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c
index c131207aa1..b1632f3ba5 100644
--- a/libavformat/argo_asf.c
+++ b/libavformat/argo_asf.c
@@ -314,14 +314,15 @@ static int argo_asf_write_header(AVFormatContext *s)
{
const AVCodecParameters *par = s->streams[0]->codecpar;
ArgoASFMuxContext *ctx = s->priv_data;
- ArgoASFFileHeader fhdr;
ArgoASFChunkHeader chdr;
+ ArgoASFFileHeader fhdr = {
+ .magic = ASF_TAG,
+ .version_major = (uint16_t)ctx->version_major,
+ .version_minor = (uint16_t)ctx->version_minor,
+ .num_chunks = 1,
+ .chunk_offset = ASF_FILE_HEADER_SIZE
+ };
- fhdr.magic = ASF_TAG;
- fhdr.version_major = (uint16_t)ctx->version_major;
- fhdr.version_minor = (uint16_t)ctx->version_minor;
- fhdr.num_chunks = 1;
- fhdr.chunk_offset = ASF_FILE_HEADER_SIZE;
/*
* If the user specified a name, use it as is. Otherwise take the
* basename and lop off the extension (if any).