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)
commitf85746509ca8b727d97ff801a63a22f81fd27a0c
treee9c655fc06a82cb49b94fb500b453261efe7b846
parent82de3e16a8aac7607a1e37f0ad61a5a51238e2ac
parentfcf550c2cbc35c1c4d90f8d23bb3340ebc31ce46
Merge remote-tracking branch 'dwbuiten/master'

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

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