commit efd453d82d5cd6c064644022a4153fe4bd45f8b7
author Reinhard Tartler <siretart@tauware.de> Thu Jan 05 21:40:18 2012 +0100
committer Reinhard Tartler <siretart@tauware.de> Sun Jan 08 09:40:38 2012 +0100
tree f673ae8d39c5a9f0854b5639a4b5ca4c2b7b08a7
parent 7ee536e87a569174775dabdd959a9b12c1d2ac3d

vorbisdec: Fix decoding bug with channel handling

Fixes Bug: #191
Chromium Bug: #101458
CVE-2011-3895

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit e6d527ff729e42d80e4756cab779ff4ad693631b)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit 97f23c72a3815739ab28e297ce60f943349f6939)

Conflicts:

	libavcodec/vorbis_dec.c
(cherry picked from commit 42f0a6696889ba275aa2087b57fa99f7a97033a0)

Conflicts:

	libavcodec/vorbis_dec.c