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

Merge commit 'bf4b0ed1'


* commit 'bf4b0ed1':
  Add missing deprecation attributes

Conflicts:
	libavfilter/avfilter.h

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 8ff23f0e bf4b0ed1
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment