diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-07-08 00:16:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-07-18 16:57:03 +0200 |
| commit | 2c0e98a0b478284bdff6d7a4062522605a8beae5 (patch) | |
| tree | 59340fdc0d159d23255cfc628097045c1c78ab34 | |
| parent | a1d4de0559cc19bc349bc8a20e99673dc26cdfae (diff) | |
| download | ffmpeg-2c0e98a0b478284bdff6d7a4062522605a8beae5.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 1e4b7a1309..5e65ad3dc6 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -914,7 +914,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; |