* qatar/master:
  cmdutils: Fix build with lavfi disabled
  flvenc: do not mux more than one stream per type
Merged-by: Michael Niedermayer <michaelni@gmx.at>