virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Code Issues Releases Activity

avformat/mov_chan: Make ff_mov_get_channel_layout() static

Browse Source 
Possible since 3bab7cd12802dc5abf2c5cc6dec49e9e249ce204.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2021-09-06 13:52:06 +02:00
parent 41751e4aef
commit 49916dafb9
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/mov_chan.c
View File

@ -451,7 +451,14 @@ static const struct {
{ AV_CODEC_ID_NONE, NULL }, { 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; int i, channels;
const struct MovChannelLayoutMap *layout_map; const struct MovChannelLayoutMap *layout_map;
@ -591,7 +598,7 @@ int ff_mov_read_chan(AVFormatContext *s, AVIOContext *pb, AVStream *st,
if (label_mask) if (label_mask)
st->codecpar->channel_layout = label_mask; st->codecpar->channel_layout = label_mask;
} else } 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); avio_skip(pb, size - 12);
return 0; return 0;

9
libavformat/mov_chan.h
View File

@ -31,15 +31,6 @@
#include "libavcodec/codec_id.h" #include "libavcodec/codec_id.h"
#include "avformat.h" #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. * 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. * If the layout tag was not found, use a channel bitmap if possible.