Skip to content

F
ffmpeg.wasm-core
Commit eb3628d8 authored by Sebastian Dröge's avatar Sebastian Dröge Committed by Michael Niedermayer
Browse files
Options

mpegtsenc: Fix off-by-one in indexing into Opus channel mapping arrays 

Fixes, CID1338323, CID1338324
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 77a644e6
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
libavformat/mpegtsenc.c
View file @ eb3628d8
......@@ -401,11 +401,11 @@ static int mpegts_write_pmt(AVFormatContext *s, MpegTSService *service)
if (st->codec->extradata[19] == st->codec->channels - coupled_stream_counts[st->codec->channels] &&
st->codec->extradata[20] == coupled_stream_counts[st->codec->channels] &&
memcmp(&st->codec->extradata[21], channel_map_a[st->codec->channels], st->codec->channels) == 0) {
memcmp(&st->codec->extradata[21], channel_map_a[st->codec->channels-1], st->codec->channels) == 0) {
*q++ = st->codec->channels;
} else if (st->codec->channels >= 2 && st->codec->extradata[19] == st->codec->channels &&
st->codec->extradata[20] == 0 &&
memcmp(&st->codec->extradata[21], channel_map_b[st->codec->channels], st->codec->channels) == 0) {
memcmp(&st->codec->extradata[21], channel_map_b[st->codec->channels-1], st->codec->channels) == 0) {
*q++ = st->codec->channels | 0x80;
} else {
/* Unsupported, could write an extended descriptor here */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment