Merge commit '883795fb0face00a07349fbd32f4775431a9f30d' into release/2.4
* commit '883795fb0face00a07349fbd32f4775431a9f30d': h264: restore a block mistakenly removed ine10fd08aSee:0ecb3075c1Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in: