Revision ba7a2804 libavcodec/vorbis_dec.c

View differences:

libavcodec/vorbis_dec.c
1007 1007
    avccontext->channels    = vc->audio_channels;
1008 1008
    avccontext->sample_rate = vc->audio_samplerate;
1009 1009
    avccontext->frame_size  = FFMIN(vc->blocksize[0], vc->blocksize[1]) >> 2;
1010
    /* ffdshow custom code */
1011
#if CONFIG_AUDIO_FLOAT
1012
    avccontext->sample_fmt  = AV_SAMPLE_FMT_FLT;
1013
#else
1010 1014
    avccontext->sample_fmt  = AV_SAMPLE_FMT_S16;
1015
#endif
1011 1016

  
1012 1017
    return 0 ;
1013 1018
}
......
1635 1640
                              len * ff_vorbis_channel_layout_offsets[vc->audio_channels - 1][i];
1636 1641
    }
1637 1642

  
1643
    /* ffdshow custom code */
1644
#if CONFIG_AUDIO_FLOAT
1645
    float_interleave(data, channel_ptrs, len, vc->audio_channels);
1646
    *data_size = len * sizeof(float) * vc->audio_channels;
1647
#else
1638 1648
    vc->fmt_conv.float_to_int16_interleave(data, channel_ptrs, len,
1639 1649
                                           vc->audio_channels);
1640 1650
    *data_size = len * 2 * vc->audio_channels;
1651
#endif
1641 1652

  
1642 1653
    return buf_size ;
1643 1654
}

Also available in: Unified diff