[FFmpeg-devel] [PATCH] Vorbis decoder channel layout support

[Robert Swain]

Hello,

2009/10/1 Robert Swain <robert.swain at gmail.com>:
> 2009/9/21 Diego Biurrun <diego at biurrun.de>:
>> On Sun, Sep 20, 2009 at 11:03:04PM +0200, Robert Swain wrote:
>>> $subject
>>>
>>> --- libavcodec/vorbis_dec.c ? (revision 19930)
>>> +++ libavcodec/vorbis_dec.c ? (working copy)
>>> @@ -954,6 +954,11 @@
>>>
>>> + ? ?if (avccontext->channels > 6) {
>>> + ? ? ? ?avccontext->channel_layout = 0;
>>> + ? ?} else
>>> + ? ? ? ?avccontext->channel_layout = ff_vorbis_channel_layouts[avccontext->channels - 1];
>>> +
>>
>> I'd say you should either use no {} or place them after the else as
>> well.
>
> Changed to use them for both.
>
> Patch updated to apply to trunk. If there are no further comments on
> this, I will apply it tomorrow as I'm confident it is both correct and
> cleanly done.

Applied with the small fix that the above quoted hunk should depend on
vc->audio_channels rather than avccontext->channels as
avccontext->channels had not yet been set.

Regards,
Rob