Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Dec 2012 12:21:36 +0000 (13:21 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Dec 2012 12:21:42 +0000 (13:21 +0100)
commitefb4f96a7a8bc22f0f615e7e21a2bfe9b0f5088e
tree9fd7ba29cb727cf07608aaddd60cda9d41000b0d
parent94877aad57bdba7686ef42619c111d1c5c725520
parenta421bbfe83ad55eff335fc19bbacc1e9fecfc3cf
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: fix memleak on error during SPS parsing

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