Merge commit '6327c10702922eabcb1c6170abd3f03d23ce4c51'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Mar 2013 20:39:32 +0000 (21:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Mar 2013 20:39:38 +0000 (21:39 +0100)
commit0d0f76ea56975e5ecf536c59d455963d0f6742c4
treed0a3cb5d8b15d61428382104a8084a7b7a6cc028
parentd64b8540751bf8debab4ebcfad6ff87c61d3c19d
parent6327c10702922eabcb1c6170abd3f03d23ce4c51
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@gmx.at>
libavcodec/libmp3lame.c
libavcodec/png.c
libavutil/atomic_gcc.h