[FFmpeg-cvslog] Merge commit 'ac84c1ce24a285f9cf16d4297bce73b1c4a6e435'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 25 03:08:19 2014 +0200| [1945db1f13071aced7fcb25573980540c19156ea] | committer: Michael Niedermayer

Merge commit 'ac84c1ce24a285f9cf16d4297bce73b1c4a6e435'

* commit 'ac84c1ce24a285f9cf16d4297bce73b1c4a6e435':
  avfilter: check filter link validity

Conflicts:
	libavfilter/avfilter.c

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

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