Merge commit '863ee8a855b8ce27ffef41479eb66da58763faed'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 21 Nov 2014 20:39:26 +0000 (21:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 21 Nov 2014 21:12:46 +0000 (22:12 +0100)
* commit '863ee8a855b8ce27ffef41479eb66da58763faed':
  lavfi: clean memory on error in ADD_FORMAT()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavfilter/formats.c

Simple merge