diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-09-06 13:52:06 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-09-08 22:59:14 +0200 |
| commit | 49916dafb955d992160c4778b76099c848a35390 (patch) | |
| tree | b3b82adc51705cde794be09eb8cd811d88b5f296 | |
| parent | 41751e4aefc5d1b12d45a3cbcc33d3d9b704609a (diff) | |
| download | ffmpeg-49916dafb955d992160c4778b76099c848a35390.tar.gz | |
avformat/mov_chan: Make ff_mov_get_channel_layout() static
Possible since 3bab7cd12802dc5abf2c5cc6dec49e9e249ce204.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -rw-r--r-- | libavformat/mov_chan.c | 11 | ||||
| -rw-r--r-- | 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 4ec16f15c2..349634094c 100644 --- a/libavformat/mov_chan.c +++ b/libavformat/mov_chan.c @@ -451,7 +451,14 @@ static const struct { { AV_CODEC_ID_NONE, NULL }, }; -uint64_t ff_mov_get_channel_layout(uint32_t tag, uint32_t bitmap) +/** + * Get the channel layout for the specified channel layout tag. + * + * @param[in] tag channel layout tag + * @param[out] bitmap channel bitmap (only used if needed) + * @return channel layout + */ +static uint64_t mov_get_channel_layout(uint32_t tag, uint32_t bitmap) { int i, channels; const struct MovChannelLayoutMap *layout_map; @@ -591,7 +598,7 @@ int ff_mov_read_chan(AVFormatContext *s, AVIOContext *pb, AVStream *st, if (label_mask) st->codecpar->channel_layout = label_mask; } else - st->codecpar->channel_layout = ff_mov_get_channel_layout(layout_tag, bitmap); + st->codecpar->channel_layout = mov_get_channel_layout(layout_tag, bitmap); avio_skip(pb, size - 12); return 0; diff --git a/libavformat/mov_chan.h b/libavformat/mov_chan.h index 978b8a3732..f7916e9899 100644 --- a/libavformat/mov_chan.h +++ b/libavformat/mov_chan.h @@ -32,15 +32,6 @@ #include "avformat.h" /** - * Get the channel layout for the specified channel layout tag. - * - * @param[in] tag channel layout tag - * @param[out] bitmap channel bitmap (only used if needed) - * @return channel layout - */ -uint64_t ff_mov_get_channel_layout(uint32_t tag, uint32_t bitmap); - -/** * Get the channel layout tag for the specified codec id and channel layout. * If the layout tag was not found, use a channel bitmap if possible. * |