[FFmpeg-cvslog] Merge commit 'e9d61de96c113ee0ef8082833c7e682df0e23eec'
Michael Niedermayer
git at videolan.org
Fri Sep 20 13:18:15 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Sep 20 13:05:37 2013 +0200| [3f4cf77abde20b83832b8860882f4a4c9c0e8572] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3f4cf77abde20b83832b8860882f4a4c9c0e8572
---
More information about the ffmpeg-cvslog
mailing list