[FFmpeg-cvslog] Merge commit '88b160a457e491cb9e014630ef5387ad3500258e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar  6 01:04:19 2015 +0100| [f455c8fdef0a28facff05b509b0958ffb9604e10] | committer: Michael Niedermayer

Merge commit '88b160a457e491cb9e014630ef5387ad3500258e'

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

Conflicts:
	libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f455c8fdef0a28facff05b509b0958ffb9604e10
---