ffmpeg | branch: release/1.1 | Michael Niedermayer <[email protected]> | Tue Mar
10 13:45:40 2015 +0100| [396b47d2a71797e77ad22567b5f2f1ac9874ee51] | committer:
Michael Niedermayer
Merge commit 'c17da32ba26d2c333bd9cd4afe38a1b36e3d6cba' into release/1.1
* commit 'c17da32ba26d2c333bd9cd4afe38a1b36e3d6cba':
eamad: check for out of bounds read
Conflicts:
libavcodec/eamad.c
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=396b47d2a71797e77ad22567b5f2f1ac9874ee51
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
