diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2018-07-08 00:16:42 +0200 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-07-17 11:46:33 +0200 |
commit | 2b8d4f6f0186b3ed0b223f665d32c36ed887149e (patch) | |
tree | 41626f80a7bf9a98870fbfecc9d1644088ef34ec | |
parent | a8c5c71a0489b2b391af6d356385e5718af97d8f (diff) | |
download | ffmpeg-2b8d4f6f0186b3ed0b223f665d32c36ed887149e.tar.gz |
avformat/movenc: Write version 2 of audio atom if channels is not known
The version 1 needs the channel count and would divide by 0
Fixes: division by 0
Fixes: fpe_movenc.c_1108_1.ogg
Fixes: fpe_movenc.c_1108_2.ogg
Fixes: fpe_movenc.c_1108_3.wav
Found-by: #CHEN HONGXU# <HCHEN017@e.ntu.edu.sg>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit fa19fbcf712a6a6cc5a5cfdc3254a97b9bce6582)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r-- | libavformat/movenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index cfbe554dd4..b57778bd4f 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -964,7 +964,7 @@ static int mov_write_audio_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex uint32_t tag = track->tag; if (track->mode == MODE_MOV) { - if (track->timescale > UINT16_MAX) { + if (track->timescale > UINT16_MAX || !track->par->channels) { if (mov_get_lpcm_flags(track->par->codec_id)) tag = AV_RL32("lpcm"); version = 2; |