Commit 06549cee authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '7798a59d'

* commit '7798a59d':
  avconv: Don't include colorspace.h

No change as the commit is already part of ffmpeg.
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents c1fc4ff9 7798a59d
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