[FFmpeg-cvslog] Merge commit 'cffecc0e7ebd642afaa1fb9f56fab1fcc283293c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov  7 23:05:26 2013 +0100| [ec8e68c7633cd288c90e6e7057365d8c354661a4] | committer: Michael Niedermayer

Merge commit 'cffecc0e7ebd642afaa1fb9f56fab1fcc283293c'

* commit 'cffecc0e7ebd642afaa1fb9f56fab1fcc283293c':
  avfilter/graphparser: Directly free filter memory if initialization fails

Conflicts:
	libavfilter/graphparser.c

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

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