Merge commit '60d4c6ff76467d4d8f55c1cc61ab6c618e8ea2f3'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 27 Dec 2014 13:56:10 +0000 (14:56 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 27 Dec 2014 14:02:12 +0000 (15:02 +0100)
* commit '60d4c6ff76467d4d8f55c1cc61ab6c618e8ea2f3':
  h264: restore a block mistakenly removed in e10fd08a

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

No differences found