* commit 'c3bd1d60':
  formats: Check memory allocations

Conflicts:
	libavfilter/formats.c

See: 527ca398Merged-by: Michael Niedermayer <michaelni@gmx.at>