commit 7944a87ba8a6b1faf167d5b116dfa55233e0a697
author Alex Converse <alex.converse@gmail.com> Fri Feb 17 14:13:40 2012 -0800
committer Reinhard Tartler <siretart@tauware.de> Mon May 28 23:46:08 2012 +0200
tree f9fea04b36227d9d492d18d78a50f59aeab91bfa
parent 4b2e02a4c4a618ac6d03fd38eb7ab0bc09596667

dpcm: ignore extra unpaired bytes in stereo streams.

Fixes: CVE-2011-3951

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
(cherry picked from commit ce7aee9b733134649a6ce2fa743e51733f33e67e)
(cherry picked from commit eaeaeb265fe46e1d81452960de918227541873b4)

Conflicts:

	libavcodec/dpcm.c

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

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

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