eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-06-16 04:32:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

avformat/mov_chan: don't share a function that's only used where it's defined

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2026-05-21 18:04:02 -03:00
parent 99e1ecca36
commit b67570b765
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavformat/mov_chan.c
+9 -2
View File
@@ -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;
}
libavformat/mov_chan.h
-9
View File
@@ -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.
*/