Merge commit '88b160a457e491cb9e014630ef5387ad3500258e'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Mar 2015 00:04:19 +0000 (01:04 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Mar 2015 00:16:47 +0000 (01:16 +0100)
* commit '88b160a457e491cb9e014630ef5387ad3500258e':
  avfilter: Return more meaningful error codes

Conflicts:
libavfilter/avfilter.c

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

Simple merge