Skip to content
Snippets Groups Projects
Commit 2c0b246b authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge remote-tracking branch 'qatar/master' 


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

See: 7c2bb79f
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 459db512 d06ca204
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment