Merge commit '883795fb0face00a07349fbd32f4775431a9f30d' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 9 Jan 2015 16:06:27 +0000 (17:06 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 9 Jan 2015 16:06:54 +0000 (17:06 +0100)
* commit '883795fb0face00a07349fbd32f4775431a9f30d':
  h264: restore a block mistakenly removed in e10fd08a

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

Trivial merge