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 23:46:08 +0200 |
| commit | 7867cbaf6c2583642c8f3a909a9c6f00ec01b162 (patch) | |
| tree | 025d50dd0ee7fbc805dde34c730a814814bc1530 /ffplay.c | |
| parent | 0bf8e22cdb0bbe7bc9cba9ba1046b5eae509098b (diff) | |
| download | ffmpeg-7867cbaf6c2583642c8f3a909a9c6f00ec01b162.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>
(cherry picked from commit a0f58c3a605b8123039628d1598cb36f1da0e815)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Diffstat (limited to 'ffplay.c')
0 files changed, 0 insertions, 0 deletions