[FFmpeg-cvslog] Merge commit 'd79bd6040599ef017dc45d5997fcc959ab1f71f6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat May 18 13:10:57 2013 +0200| [fb8dde37e4b0d7966194bc614a1040eee902c4e1] | committer: Michael Niedermayer

Merge commit 'd79bd6040599ef017dc45d5997fcc959ab1f71f6'

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

Conflicts:
	libavfilter/avfilter.c

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

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