[FFmpeg-cvslog] Merge commit '6327c10702922eabcb1c6170abd3f03d23ce4c51'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 12 21:39:32 2013 +0100| [0d0f76ea56975e5ecf536c59d455963d0f6742c4] | committer: Michael Niedermayer

Merge commit '6327c10702922eabcb1c6170abd3f03d23ce4c51'

* commit '6327c10702922eabcb1c6170abd3f03d23ce4c51':
  atomic: fix CAS with armcc.
  png: use av_mallocz_array() for the zlib zalloc function
  libmp3lame: use the correct remaining buffer size when flushing

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

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