ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Feb 23
21:29:35 2015 +0100| [cce8f750d91c013da00f5191ad537450172acc0c] | committer:
Michael Niedermayer
Merge commit '061c489895d29049a88dc6118e4b639a273b31d6'
* commit '061c489895d29049a88dc6118e4b639a273b31d6':
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=cce8f750d91c013da00f5191ad537450172acc0c
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
