Merge remote-tracking branch 'dwbuiten/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 4 Aug 2012 19:21:41 +0000 (21:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 4 Aug 2012 19:21:46 +0000 (21:21 +0200)
* dwbuiten/master:
  zerocodec: Fix memleak in decode_frame
  zerocodec: Cosmetics

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

Trivial merge