This avoids empty streams from being selected if a equivalent non empty one is available
The new system is also clearer and more systematic
This may need finetuning, which should be easy to do ...

Fixes Ticket2687
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>