Commit 9e893473 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '60d4c6ff'

* commit '60d4c6ff':
  h264: restore a block mistakenly removed in e10fd08a

See: 0ecb3075Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 6f764d29 60d4c6ff
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment