diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-20 13:05:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-20 13:06:12 +0200 |
| commit | 3f4cf77abde20b83832b8860882f4a4c9c0e8572 (patch) | |
| tree | 7c837661178f07dc18daf5fab68cdf4d0e546d1d /libavcodec/mace.c | |
| parent | 13b353a7cb27b5c749c2e7bc987053a566445efb (diff) | |
| parent | e9d61de96c113ee0ef8082833c7e682df0e23eec (diff) | |
| download | ffmpeg-3f4cf77abde20b83832b8860882f4a4c9c0e8572.tar.gz | |
Merge commit 'e9d61de96c113ee0ef8082833c7e682df0e23eec'
* commit 'e9d61de96c113ee0ef8082833c7e682df0e23eec':
mpegaudiodec: Validate that the number of channels fits at the given offset
Conflicts:
libavcodec/mpegaudiodec.c
See: 51fcf276f8ce66be530549da6b8d96a4bd3087aa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mace.c')
0 files changed, 0 insertions, 0 deletions