Merge commit '7ebf1b4adad40e2b0d88ebd5cfde821a7a0ceab2'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 19 Jan 2016 07:40:32 +0000 (08:40 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 19 Jan 2016 07:40:32 +0000 (08:40 +0100)
commit4440c8e9c98f138a04dafdec8f3d21ce8f07f7b9
treea4b2f58df9fd319fe2698d1718723f11572b14c3
parentc1a3683f26fb49ae700f0c202ab395cbcbd927a5
parent7ebf1b4adad40e2b0d88ebd5cfde821a7a0ceab2
Merge commit '7ebf1b4adad40e2b0d88ebd5cfde821a7a0ceab2'

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
ffmpeg.c