[FFmpeg-devel] [PATCH] audioconvert: fix type of av_get_default_channel_layout

[Michael Niedermayer]

On Thu, Oct 06, 2011 at 11:44:48PM +0200, Marton Balint wrote:
> Signed-off-by: Marton Balint <cus at passwd.hu>
> ---
>  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);

this breaks ABI sadly
thus i think we need a av_get_default_channel_layout2() if there is a
default channel layout that needs more than the low 32bit

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Let us carefully observe those good qualities wherein our enemies excel us
and endeavor to excel them, by avoiding what is faulty, and imitating what
is excellent in them. -- Plutarch
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20111007/ce2dcbdc/attachment.asc>