Revision 168f9e8c libavcodec/utils.c

View differences:

libavcodec/utils.c
578 578
                }
579 579
            }
580 580
        }
581
        if (avctx->channel_layout && avctx->channels) {
582
            if (av_get_channel_layout_nb_channels(avctx->channel_layout) != avctx->channels) {
583
                av_log(avctx, AV_LOG_ERROR, "channel layout does not match number of channels\n");
584
                ret = AVERROR(EINVAL);
585
                goto free_and_end;
586
            }
587
        }
581 588
    }
582 589

  
583 590
    if(avctx->codec->init && !(avctx->active_thread_type&FF_THREAD_FRAME)){

Also available in: Unified diff