[FFmpeg-cvslog] Merge remote-tracking branch 'dwbuiten/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Aug  4 21:21:41 2012 +0200| [f85746509ca8b727d97ff801a63a22f81fd27a0c] | committer: Michael Niedermayer

Merge remote-tracking branch 'dwbuiten/master'

* dwbuiten/master:
  zerocodec: Fix memleak in decode_frame
  zerocodec: Cosmetics

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

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