ffmpeg | branch: release/2.2 | Michael Niedermayer <[email protected]> | Wed May
6 17:09:59 2015 +0200| [0756fa87bffd24a71d034e634d05ad14c2d81e4a] | committer:
Michael Niedermayer
Merge commit 'd36d3ae02ca7d535de2b26fa0b3ab44387d19b6a' into release/2.2
* commit 'd36d3ae02ca7d535de2b26fa0b3ab44387d19b6a':
alsdec: check sample pointer range in revert_channel_correlation
Conflicts:
libavcodec/alsdec.c
See: afc7748d1f6abc4b3b1cc957b0fa6941837db3d0
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0756fa87bffd24a71d034e634d05ad14c2d81e4a
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
