ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sun Feb  1 
13:52:22 2015 +0100| [fa73358c9bfd3cb433c6f31a31fc4128c762d809] | committer: 
Michael Niedermayer

Merge commit '60392480181f24ebf3ab48d8ac3614705de90152'

* commit '60392480181f24ebf3ab48d8ac3614705de90152':
  mem: fix pointer pointer aliasing violations

Conflicts:
        libavutil/mem.c

Merged-by: Michael Niedermayer <michae...@gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fa73358c9bfd3cb433c6f31a31fc4128c762d809
---



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

Reply via email to