[FFmpeg-cvslog] audioconvert: fix type of av_get_default_channel_layout

[Marton Balint]

ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Thu Oct  6 23:44:48 2011 +0200| [d2ba6044217588788534ed1bf1609385d804e956] | committer: Michael Niedermayer

audioconvert: fix type of av_get_default_channel_layout

Signed-off-by: Marton Balint <cus at passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d2ba6044217588788534ed1bf1609385d804e956
---

 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 be7a0f7..d89796d 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 03965cc..8cef7f6 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 */