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)
* qatar/master:
  h264: fix memleak on error during SPS parsing

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

Trivial merge