Merge commit 'cffecc0e7ebd642afaa1fb9f56fab1fcc283293c'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Nov 2013 22:05:26 +0000 (23:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Nov 2013 22:05:26 +0000 (23:05 +0100)
commitec8e68c7633cd288c90e6e7057365d8c354661a4
treea5484fbf0e55694e4c0c47e0c8bee4720b09fce9
parent7c02a77d250ff24514e029d931f7bc16b3810504
parentcffecc0e7ebd642afaa1fb9f56fab1fcc283293c
Merge commit 'cffecc0e7ebd642afaa1fb9f56fab1fcc283293c'

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

Conflicts:
libavfilter/graphparser.c

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