[FFmpeg-cvslog] Merge commit 'f83896abda1e78ebbbda0f184b682b4fabadc682'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 23 01:03:21 2014 +0200| [efec730431848bc0f3bf86d58ac838ca6594b62d] | committer: Michael Niedermayer

Merge commit 'f83896abda1e78ebbbda0f184b682b4fabadc682'

* commit 'f83896abda1e78ebbbda0f184b682b4fabadc682':
  ape: Replace memset(0) by zero initialization

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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