summaryrefslogtreecommitdiff
path: root/libavutil/audioconvert.c
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2011-11-25 12:51:57 +0000
committerMans Rullgard <mans@mansr.com>2011-11-25 13:19:54 +0000
commitcc276c85d15272df6e44fb3252657a43cbd49555 (patch)
treebaed10d2966866ed98d9887cd437cc43e009329f /libavutil/audioconvert.c
parent00a856e3f95214c54a878b7cbd6e8ae8c5ce3ca9 (diff)
Make channel layout masks unsigned
It makes more sense for a bit mask to use an unsigned type. The change should be source and binary compatible on all supported systems, hence micro version bump. Fixes a few invalid shifts. Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavutil/audioconvert.c')
-rw-r--r--libavutil/audioconvert.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavutil/audioconvert.c b/libavutil/audioconvert.c
index 7250e36d90..52656c7302 100644
--- a/libavutil/audioconvert.c
+++ b/libavutil/audioconvert.c
@@ -60,7 +60,7 @@ static const char *get_channel_name(int channel_id)
static const struct {
const char *name;
int nb_channels;
- int64_t layout;
+ uint64_t layout;
} channel_layout_map[] = {
{ "mono", 1, AV_CH_LAYOUT_MONO },
{ "stereo", 2, AV_CH_LAYOUT_STEREO },
@@ -77,7 +77,7 @@ static const struct {
{ 0 }
};
-int64_t av_get_channel_layout(const char *name)
+uint64_t av_get_channel_layout(const char *name)
{
int i = 0;
do {
@@ -90,7 +90,7 @@ int64_t av_get_channel_layout(const char *name)
}
void av_get_channel_layout_string(char *buf, int buf_size,
- int nb_channels, int64_t channel_layout)
+ int nb_channels, uint64_t channel_layout)
{
int i;
@@ -123,7 +123,7 @@ void av_get_channel_layout_string(char *buf, int buf_size,
}
}
-int av_get_channel_layout_nb_channels(int64_t channel_layout)
+int av_get_channel_layout_nb_channels(uint64_t channel_layout)
{
int count;
uint64_t x = channel_layout;