[FFmpeg-cvslog] Merge commit '863ee8a855b8ce27ffef41479eb66da58763faed'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 21 21:39:26 2014 +0100| [42f3cb419aa0903eb11ac69ea94e636992a170ca] | committer: Michael Niedermayer

Merge commit '863ee8a855b8ce27ffef41479eb66da58763faed'

* commit '863ee8a855b8ce27ffef41479eb66da58763faed':
  lavfi: clean memory on error in ADD_FORMAT()

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=42f3cb419aa0903eb11ac69ea94e636992a170ca
---