Related to ticket #2324, #2325.

Stream duration still need to be fixed...
Signed-off-by: Marton Balint <cus@passwd.hu>