ffmpeg | branch: release/2.4 | Michael Niedermayer <michae...@gmx.at> | Mon Mar
9 01:18:06 2015 +0100| [5bd9c540d6a6f55f6176438e1418a2d35707460e] | committer:
Michael Niedermayer
Merge commit 'e818da77240146b36d6669b1c4e0565239dc55d3' into release/2.4
* commit 'e818da77240146b36d6669b1c4e0565239dc55d3':
eamad: check for out of bounds read
Conflicts:
libavcodec/eamad.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5bd9c540d6a6f55f6176438e1418a2d35707460e
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
