diff options
| author | Janne Grunau <janne-libav@jannau.net> | 2012-01-05 20:50:55 +0100 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2012-05-28 21:21:53 +0200 |
| commit | 15c819e23ff1820ab6e0ea71291f939e36b2efb3 (patch) | |
| tree | 4fe026ca01e89ce50dc5a1099444435e75440569 /cmdutils.c | |
| parent | 7a5fbe40344ae51ce629cc0694a436535beb1233 (diff) | |
| download | ffmpeg-15c819e23ff1820ab6e0ea71291f939e36b2efb3.tar.gz | |
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>
Diffstat (limited to 'cmdutils.c')
0 files changed, 0 insertions, 0 deletions