Merge commit 'ac84c1ce24a285f9cf16d4297bce73b1c4a6e435'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 25 Oct 2014 01:08:19 +0000 (03:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 25 Oct 2014 01:08:19 +0000 (03:08 +0200)
commit1945db1f13071aced7fcb25573980540c19156ea
treea7f4f8d1dc84fe8fa56ad426154eb23b569c0e63
parent4ef02ddd818857e479c90bca85894a5a2e1bea9d
parentac84c1ce24a285f9cf16d4297bce73b1c4a6e435
Merge commit 'ac84c1ce24a285f9cf16d4297bce73b1c4a6e435'

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

Conflicts:
libavfilter/avfilter.c

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