Merge commit '1565cbc65cbb9f95c11367314a080068895e0cf0'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 22:54:05 +0000 (00:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 22:54:05 +0000 (00:54 +0200)
commiteb0f774d4bfdb1e5cb131f63580417cfb6b47514
tree4b09152f83728967ff6bd1bd3a0d72213be4d26f
parent4fde705396759ad96a662a400d5f1667c19c614b
parent1565cbc65cbb9f95c11367314a080068895e0cf0
Merge commit '1565cbc65cbb9f95c11367314a080068895e0cf0'

* commit '1565cbc65cbb9f95c11367314a080068895e0cf0':
  lavfi: make avfilter_free() remove the filter from its graph.

Conflicts:
libavfilter/avfilter.c
libavfilter/avfiltergraph.c
libavfilter/graphparser.c

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