Merge commit 'f160c6a18a574b4c7d063e0a748037cbbd9912ee'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Apr 2013 13:13:59 +0000 (15:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Apr 2013 13:14:08 +0000 (15:14 +0200)
* commit 'f160c6a18a574b4c7d063e0a748037cbbd9912ee':
  lavfi: do not segfault on NULL passed to avfilter_get_by_name()

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

Simple merge