If AVCodecContext.channels is 0 and AVCodecContext.channel_layout is

non-zero, set channels based on channel_layout.

This allows the user to set only channel_layout and not channels.

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index e4ea1e5..6844188 100644 (file)
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -584,6 +584,8 @@ int attribute_align_arg avcodec_open(AVCodecContext *avctx, AVCodec *codec)
                 ret = AVERROR(EINVAL);
                 goto free_and_end;
             }
+        } else if (avctx->channel_layout) {
+            avctx->channels = av_get_channel_layout_nb_channels(avctx->channel_layout);
         }
     }