From d2ba6044217588788534ed1bf1609385d804e956 Mon Sep 17 00:00:00 2001 From: Marton Balint Date: Thu, 6 Oct 2011 23:44:48 +0200 Subject: [PATCH] audioconvert: fix type of av_get_default_channel_layout Signed-off-by: Marton Balint Signed-off-by: Michael Niedermayer --- libavutil/audioconvert.c | 2 +- libavutil/audioconvert.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavutil/audioconvert.c b/libavutil/audioconvert.c index be7a0f7c3a..d89796de1a 100644 --- a/libavutil/audioconvert.c +++ b/libavutil/audioconvert.c @@ -132,7 +132,7 @@ int av_get_channel_layout_nb_channels(int64_t channel_layout) return count; } -int av_get_default_channel_layout(int nb_channels) { +int64_t av_get_default_channel_layout(int nb_channels) { int i; for (i = 0; channel_layout_map[i].name; i++) if (nb_channels == channel_layout_map[i].nb_channels) diff --git a/libavutil/audioconvert.h b/libavutil/audioconvert.h index 03965ccc7d..8cef7f650a 100644 --- a/libavutil/audioconvert.h +++ b/libavutil/audioconvert.h @@ -95,6 +95,6 @@ int av_get_channel_layout_nb_channels(int64_t channel_layout); /** * Return default channel layout for a given number of channels. */ -int av_get_default_channel_layout(int nb_channels); +int64_t av_get_default_channel_layout(int nb_channels); #endif /* AVUTIL_AUDIOCONVERT_H */