Merge commit 'd79bd6040599ef017dc45d5997fcc959ab1f71f6'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 18 May 2013 11:10:57 +0000 (13:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 18 May 2013 11:10:57 +0000 (13:10 +0200)
commitfb8dde37e4b0d7966194bc614a1040eee902c4e1
treed0934d26819c7ee16521f5b63d103701316bace1
parentdd2eaf57b76033bf5e8d49457088dec60ad3e9a4
parentd79bd6040599ef017dc45d5997fcc959ab1f71f6
Merge commit 'd79bd6040599ef017dc45d5997fcc959ab1f71f6'

* commit 'd79bd6040599ef017dc45d5997fcc959ab1f71f6':
  lavfi: factorize freeing a link

Conflicts:
libavfilter/avfilter.c

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