* [FFmpeg-devel] [PATCH v2] avformat/mov: fix 2 compile errors
@ 2023-03-16 5:32 Tong Wu
2023-03-16 5:48 ` Xiang, Haihao
0 siblings, 1 reply; 3+ messages in thread
From: Tong Wu @ 2023-03-16 5:32 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Tong Wu
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>
---
libavformat/mov_chan.c | 2 +-
libavformat/movenc.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c
index df17976e59..f3d51899e1 100644
--- a/libavformat/mov_chan.c
+++ b/libavformat/mov_chan.c
@@ -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,
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 2ec575c954..68e7f8222b 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -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));
--
2.35.1.windows.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [FFmpeg-devel] [PATCH v2] avformat/mov: fix 2 compile errors
2023-03-16 5:32 [FFmpeg-devel] [PATCH v2] avformat/mov: fix 2 compile errors Tong Wu
@ 2023-03-16 5:48 ` Xiang, Haihao
2023-03-16 7:01 ` "zhilizhao(赵志立)"
0 siblings, 1 reply; 3+ messages in thread
From: Xiang, Haihao @ 2023-03-16 5:48 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Wu, Tong1
On Do, 2023-03-16 at 13:32 +0800, Tong Wu wrote:
> 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>
> ---
> libavformat/mov_chan.c | 2 +-
> libavformat/movenc.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c
> index df17976e59..f3d51899e1 100644
> --- a/libavformat/mov_chan.c
> +++ b/libavformat/mov_chan.c
> @@ -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,
> diff --git a/libavformat/movenc.c b/libavformat/movenc.c
> index 2ec575c954..68e7f8222b 100644
> --- a/libavformat/movenc.c
> +++ b/libavformat/movenc.c
> @@ -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));
LGTM.
- Haihao
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [FFmpeg-devel] [PATCH v2] avformat/mov: fix 2 compile errors
2023-03-16 5:48 ` Xiang, Haihao
@ 2023-03-16 7:01 ` "zhilizhao(赵志立)"
0 siblings, 0 replies; 3+ messages in thread
From: "zhilizhao(赵志立)" @ 2023-03-16 7:01 UTC (permalink / raw)
To: FFmpeg development discussions and patches; +Cc: Wu, Tong1
> On Mar 16, 2023, at 13:48, Xiang, Haihao <haihao.xiang-at-intel.com@ffmpeg.org> wrote:
>
> On Do, 2023-03-16 at 13:32 +0800, Tong Wu wrote:
>> 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>
>> ---
>> libavformat/mov_chan.c | 2 +-
>> libavformat/movenc.c | 2 +-
>> 2 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c
>> index df17976e59..f3d51899e1 100644
>> --- a/libavformat/mov_chan.c
>> +++ b/libavformat/mov_chan.c
>> @@ -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,
>> diff --git a/libavformat/movenc.c b/libavformat/movenc.c
>> index 2ec575c954..68e7f8222b 100644
>> --- a/libavformat/movenc.c
>> +++ b/libavformat/movenc.c
>> @@ -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));
>
> LGTM.
>
> - Haihao
Applied as c3a79990. Thanks for the fix and patch review. Didn’t notice
it’s GNU extension until C23.
>
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-03-16 7:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-16 5:32 [FFmpeg-devel] [PATCH v2] avformat/mov: fix 2 compile errors Tong Wu
2023-03-16 5:48 ` Xiang, Haihao
2023-03-16 7:01 ` "zhilizhao(赵志立)"
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git