Merge commit 'a7e79f6a43bdc7e3b164dd78b060f0d5575a0cf0' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 00:11:20 +0000 (01:11 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 00:11:20 +0000 (01:11 +0100)
commitfefb152cd94c1d52cc4bf6d42d194a1f4f3e316d
tree217fd420b579d55be6da1189e2921915a35a1843
parent275cd55a0f4b0d11aa35c1dcde9c8b356f8b418f
parenta7e79f6a43bdc7e3b164dd78b060f0d5575a0cf0
Merge commit 'a7e79f6a43bdc7e3b164dd78b060f0d5575a0cf0' into release/2.4

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

Conflicts:
libavfilter/avfilter.c

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