har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/mov: fix 2 compile errors

Browse Source 
Compiler: MSVC 14.35.32215
Error type: error C2059: syntax error: '}'
Related commit: 9e1ffed fate/mov: add PCM in mp4 test
d7e8643 avformat/mov: parse ISO-14496-12 ChannelLayout

Signed-off-by: Tong Wu <tong1.wu@intel.com>
Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
Reviewed-by: Haihao Xiang <haihao.xiang@intel.com>
This commit is contained in:
Tong Wu 2023-03-16 13:32:58 +08:00 committed by Zhao Zhili
parent 85b185b504
commit c3a7999099
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/mov_chan.c
View File

@ -555,7 +555,7 @@ int ff_mov_read_chan(AVFormatContext *s, AVIOContext *pb, AVStream *st,
/* ISO/IEC 23001-8, 8.2 */
static const AVChannelLayout iso_channel_configuration[] = {
// 0: any setup
{},
{0},
// 1: centre front
AV_CHANNEL_LAYOUT_MONO,

2
libavformat/movenc.c
View File

@ -1194,7 +1194,7 @@ static int mov_write_chnl_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *tra
ret = ff_mov_get_channel_positions_from_layout(layout,
speaker_pos, layout->nb_channels);
if (ret) {
char buf[128] = {};
char buf[128] = {0};
av_freep(&speaker_pos);
av_channel_layout_describe(layout, buf, sizeof(buf));