Revision fbdcdaee libavcodec/wavpack.c

View differences:

libavcodec/wavpack.c
22 22
#include "avcodec.h"
23 23
#include "get_bits.h"
24 24
#include "unary.h"
25
#include "libavcore/audioconvert.h"
25 26

  
26 27
/**
27 28
 * @file
......
706 707
    else
707 708
        avctx->sample_fmt = AV_SAMPLE_FMT_S32;
708 709
    if(avctx->channels <= 2 && !avctx->channel_layout)
709
        avctx->channel_layout = (avctx->channels==2) ? CH_LAYOUT_STEREO : CH_LAYOUT_MONO;
710
        avctx->channel_layout = (avctx->channels==2) ? AV_CH_LAYOUT_STEREO : AV_CH_LAYOUT_MONO;
710 711

  
711 712
    s->multichannel = avctx->channels > 2;
712 713
    /* lavf demuxer does not provide extradata, Matroska stores 0x403

Also available in: Unified diff