On Wed, Jun 28, 2017 at 06:10:52PM -0400, Vittorio Giovara wrote:
> --- a/libavfilter/af_aformat.c
> +++ b/libavfilter/af_aformat.c
> @@ -94,6 +94,13 @@ static int get_sample_rate(const char *samplerate)
> +static int get_channel_layout(const char *channel_layout)
> +{
> + AVChannelLayout ch_layout = {0};
> --- a/libavfilter/af_channelmap.c
> +++ b/libavfilter/af_channelmap.c
> @@ -219,50 +223,59 @@ static av_cold int channelmap_init(AVFilterContext *ctx)
> if (s->channel_layout_str) {
> - uint64_t fmt;
> - if ((fmt = av_get_channel_layout(s->channel_layout_str)) == 0) {
> + int ret;
> + AVChannelLayout fmt = {0};
> --- a/libavfilter/af_join.c
> +++ b/libavfilter/af_join.c
> @@ -285,12 +273,14 @@ static void guess_map_any(AVFilterContext *ctx,
> ChannelMap *ch,
> - if ((inputs[i] & link->channel_layout) != link->channel_layout) {
> - uint64_t unused = link->channel_layout & ~inputs[i];
> + if ((inputs[i] & link->ch_layout.u.mask) != link->ch_layout.u.mask) {
> + uint64_t unused = link->ch_layout.u.mask & ~inputs[i];
> + AVChannelLayout layout = {0};
spaces inside {}
Diego
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
