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)
commit33c8bb2c6a87e89ed4536ed2ebaa9a1dae2fbfcb
tree3a1045bbd68ddf490c891e37349be2ffc96f89ce
parent849f55368c3609d962adf5a729e192de9027b165
parent883795fb0face00a07349fbd32f4775431a9f30d
Merge commit '883795fb0face00a07349fbd32f4775431a9f30d' into release/2.4

* commit '883795fb0face00a07349fbd32f4775431a9f30d':
  h264: restore a block mistakenly removed in e10fd08a

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