diff options
| author | Marton Balint <cus@passwd.hu> | 2011-10-06 23:44:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-07 02:53:18 +0200 |
| commit | d2ba6044217588788534ed1bf1609385d804e956 (patch) | |
| tree | 003ab0acf36756685b8aa5550caca7c0960130ca /libavutil | |
| parent | b93cb8383fec0aa95b735fcd97eff03425e79bc1 (diff) | |
| download | ffmpeg-d2ba6044217588788534ed1bf1609385d804e956.tar.gz | |
audioconvert: fix type of av_get_default_channel_layout
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/audioconvert.c | 2 | ||||
| -rw-r--r-- | 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 */ |