Merge commit '58d13cea307e776664dae711608b358dd4b84fff'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Oct 2013 21:17:38 +0000 (22:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Oct 2013 21:18:17 +0000 (22:18 +0100)
* commit '58d13cea307e776664dae711608b358dd4b84fff':
  h264: Check all allocations

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

Trivial merge