[FFmpeg-cvslog] avformat/argo_asf: initialise file header inline
Zane van Iperen
git at videolan.org
Wed Sep 16 06:34:17 EEST 2020
ffmpeg | branch: master | Zane van Iperen <zane at zanevaniperen.com> | Tue Sep 15 09:22:22 2020 +1000| [c79f07cc0c0b15252f13f56d61cf29c0081445b3] | committer: Zane van Iperen
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 at zanevaniperen.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c79f07cc0c0b15252f13f56d61cf29c0081445b3
---
libavformat/argo_asf.c | 13 +++++++------
1 file 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).
More information about the ffmpeg-cvslog
mailing list