Michael Niedermayer 3f4cf77abd Merge commit 'e9d61de96c113ee0ef8082833c7e682df0e23eec' ...

* commit 'e9d61de96c113ee0ef8082833c7e682df0e23eec':
  mpegaudiodec: Validate that the number of channels fits at the given offset

Conflicts:
	libavcodec/mpegaudiodec.c

See: 51fcf276f8
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-09-20 13:06:12 +02:00

68 KiB

Raw Blame History

View Raw