Commit 57f49fa0 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '88d1fb4e'

* commit '88d1fb4e':
  filtfmts: Avoid null pointer dereference

Conflicts:
	libavfilter/filtfmts.c

See: 24326930Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 94914d69 88d1fb4e
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