ffmpeg | branch: release/0.10 | Michael Niedermayer <michae...@gmx.at> | Wed 
Mar 11 22:50:00 2015 +0100| [22377751c9676849ea554b9220870df9dd344f7d] | 
committer: Michael Niedermayer

Merge commit '905988fe1a8accbc1ab93120aa4cd29252b81cce' into release/0.10

* commit '905988fe1a8accbc1ab93120aa4cd29252b81cce':
  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=22377751c9676849ea554b9220870df9dd344f7d
---



_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to