Merge commit '8b830ee9a26d47b138f12a82085cdb372f407f1e'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 10 Oct 2015 07:43:47 +0000 (09:43 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 10 Oct 2015 07:43:47 +0000 (09:43 +0200)
commit3e3779cd517e4d2d1f21d5eb6afdb428cd3c1aa0
treec4ed551ab301256f41c3a5f94cf13e0d0afdcda3
parent0b28039a44b33753d77116691d680bd60f3bac1f
parent8b830ee9a26d47b138f12a82085cdb372f407f1e
Merge commit '8b830ee9a26d47b138f12a82085cdb372f407f1e'

* commit '8b830ee9a26d47b138f12a82085cdb372f407f1e':
  avconv: Do not try to configure filter outputs without streams

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