mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-24 13:56:33 +02:00
Merge commit '60d4c6ff76467d4d8f55c1cc61ab6c618e8ea2f3'
* commit '60d4c6ff76467d4d8f55c1cc61ab6c618e8ea2f3': h264: restore a block mistakenly removed in e10fd08a See: 0ecb3075c1c243cfb656d1cbe0b19cdb91bde659 Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
9e89347329