Commit 2c0b246b authored by Michael Niedermayer's avatar Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  error.h: Do not circularly depend on avutil.h

See: 7c2bb79fMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 459db512 d06ca204
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