[FFmpeg-cvslog] Merge commit 'b99ca863506f0630514921b740b78364de67a3ff'

Michael Niedermayer git at videolan.org
Mon Nov 24 13:15:35 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov 24 12:58:31 2014 +0100| [bcaef717ec0ff957ae438aa274e1685d7ebfd979] | committer: Michael Niedermayer

Merge commit 'b99ca863506f0630514921b740b78364de67a3ff'

* commit 'b99ca863506f0630514921b740b78364de67a3ff':
  aacdec: avoid an out-of-bounds write

Conflicts:
	libavcodec/aacdec.c

See: ba02069a8e22985a9a775dac9ece6dc54a7e8b44
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bcaef717ec0ff957ae438aa274e1685d7ebfd979
---





More information about the ffmpeg-cvslog mailing list