commit 7867cbaf6c2583642c8f3a909a9c6f00ec01b162
author Janne Grunau <janne-libav@jannau.net> Thu Jan 05 20:50:55 2012 +0100
committer Reinhard Tartler <siretart@tauware.de> Mon May 28 23:46:08 2012 +0200
tree 025d50dd0ee7fbc805dde34c730a814814bc1530
parent 0bf8e22cdb0bbe7bc9cba9ba1046b5eae509098b

adpcm: ADPCM Electronic Arts has always two channels

Fixes half of http://ffmpeg.org/trac/ffmpeg/ticket/794
Adresses CVE-2012-0852

(cherry picked from commit bb5b3940b08d8dad5b7e948e8f3b02cd2eb70716)

Conflicts:

	libavcodec/adpcm.c

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

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

Signed-off-by: Reinhard Tartler <siretart@tauware.de>