adpcm: ADPCM Electronic Arts has always two channels
authorJanne Grunau <janne-libav@jannau.net>
Thu, 5 Jan 2012 19:50:55 +0000 (20:50 +0100)
committerReinhard Tartler <siretart@tauware.de>
Wed, 23 May 2012 13:05:27 +0000 (15:05 +0200)
commitb581580bd1cc8506befa65b0a5c9ae429240f21f
tree6a8dd27de7008b9e6342177860e5c2d298420df1
parent3313f31f012a434a7c7aac6cb2c554d5cbac88fc
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>
libavcodec/adpcm.c