Commit 4b4a7fcb authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'e7399695'

* commit 'e7399695':
  filtfmts-test: Fix use of deprecated API

Conflicts:
	libavfilter/filtfmts.c

See: f12174c8Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 2865c1b9 e7399695
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