[FFmpeg-cvslog] Merge commit '7ebf1b4adad40e2b0d88ebd5cfde821a7a0ceab2'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Tue Jan 19 08:40:32 2016 +0100| [4440c8e9c98f138a04dafdec8f3d21ce8f07f7b9] | committer: Hendrik Leppkes

Merge commit '7ebf1b4adad40e2b0d88ebd5cfde821a7a0ceab2'

* commit '7ebf1b4adad40e2b0d88ebd5cfde821a7a0ceab2':
  avconv: Simplify poll_filters() return value check

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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