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)
commitf455c8fdef0a28facff05b509b0958ffb9604e10
treed22b5ca1a16267c2d7e10a99a3652cc8e0b6e3d0
parent98d19ca8f18901b89aae66dc11c20f5a3a39d7b5
parent88b160a457e491cb9e014630ef5387ad3500258e
Merge commit '88b160a457e491cb9e014630ef5387ad3500258e'

* commit '88b160a457e491cb9e014630ef5387ad3500258e':
  avfilter: Return more meaningful error codes

Conflicts:
libavfilter/avfilter.c

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