ffmpeg | branch: master | Michael Niedermayer <[email protected]> | 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 <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bcaef717ec0ff957ae438aa274e1685d7ebfd979
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
