This is an automated email from the git hooks/post-receive script.
Git pushed a commit to branch master
in repository ffmpeg.
The following commit(s) were added to refs/heads/master by this push:
new b67570b765 avformat/mov_chan: don't share a function that's only used
where it's defined
b67570b765 is described below
commit b67570b765dced860c7edc98565d56fac519e3e7
Author: James Almer <[email protected]>
AuthorDate: Thu May 21 18:04:02 2026 -0300
Commit: James Almer <[email protected]>
CommitDate: Thu May 21 18:04:02 2026 -0300
avformat/mov_chan: don't share a function that's only used where it's
defined
Signed-off-by: James Almer <[email protected]>
---
libavformat/mov_chan.c | 11 +++++++++--
libavformat/mov_chan.h | 9 ---------
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c
index 67b22b048d..befe6ebc86 100644
--- a/libavformat/mov_chan.c
+++ b/libavformat/mov_chan.c
@@ -684,7 +684,14 @@ int ff_mov_get_channel_config_from_layout(const
AVChannelLayout *layout, int *co
return 0;
}
-int ff_mov_get_channel_layout_from_config(int config, AVChannelLayout *layout,
uint64_t omitted_channel_map)
+/**
+ * Get AVChannelLayout from ISO/IEC 23001-8 ChannelConfiguration.
+ *
+ * @return 1 if the config was unknown, layout is untouched in this case
+ * 0 if the config was found
+ * <0 on error
+ */
+static int mov_get_channel_layout_from_config(int config, AVChannelLayout
*layout, uint64_t omitted_channel_map)
{
if (config > 0) {
uint32_t layout_tag;
@@ -770,7 +777,7 @@ int ff_mov_read_chnl(AVFormatContext *s, AVIOContext *pb,
AVStream *st)
return ret;
} else {
uint64_t omitted_channel_map = avio_rb64(pb);
- ret = ff_mov_get_channel_layout_from_config(layout,
&st->codecpar->ch_layout, omitted_channel_map);
+ ret = mov_get_channel_layout_from_config(layout,
&st->codecpar->ch_layout, omitted_channel_map);
if (ret < 0)
return ret;
}
diff --git a/libavformat/mov_chan.h b/libavformat/mov_chan.h
index ea8be47196..b901538279 100644
--- a/libavformat/mov_chan.h
+++ b/libavformat/mov_chan.h
@@ -169,15 +169,6 @@ int ff_mov_read_chan(AVFormatContext *s, AVIOContext *pb,
AVStream *st,
*/
int ff_mov_get_channel_config_from_layout(const AVChannelLayout *layout, int
*config);
-/**
- * Get AVChannelLayout from ISO/IEC 23001-8 ChannelConfiguration.
- *
- * @return 1 if the config was unknown, layout is untouched in this case
- * 0 if the config was found
- * <0 on error
- */
-int ff_mov_get_channel_layout_from_config(int config, AVChannelLayout *layout,
uint64_t omitted_channel_map);
-
/**
* Get ISO/IEC 23001-8 OutputChannelPosition from AVChannelLayout.
*/
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
