Merge branch 'master' into bug_374_missingcodecwarning master-2011.03
authorFraxinas <andreas.frisch@multimedia-labs.de>
Thu, 24 Feb 2011 09:52:22 +0000 (10:52 +0100)
committerFraxinas <andreas.frisch@multimedia-labs.de>
Thu, 24 Feb 2011 09:52:22 +0000 (10:52 +0100)
commit4a3df90cd255278dc238f6bf15040f02e0fec8f3
tree5887e43258d9a85d8fd1d4e212bdc6824d7027f7
parent8eebcd73fcf118bb81f95563b312f925093d1bbe
parenta7af14d2a74cbfac606857319994f201b859e001
Merge branch 'master' into bug_374_missingcodecwarning
lib/service/servicemp3.cpp