Merge branch 'cvs.tuxbox.org'
authorStefan Seyfried <seife@tuxbox-git.slipkontur.de>
Sun, 1 Aug 2010 17:02:28 +0000 (19:02 +0200)
committerStefan Seyfried <seife@tuxbox-git.slipkontur.de>
Sun, 1 Aug 2010 17:02:28 +0000 (19:02 +0200)
commit37a04f0f6742103f3bb435fc5b0e71fdcd751c40
tree9ba21ec8de99bf06208e13575b29e46e71cbc06b
parentcd3f61f92747490f5a0f433a7c285f791bab858a
parent79b0a97d6433bd3272207759d34ee5167720f911
Merge branch 'cvs.tuxbox.org'

* cvs.tuxbox.org:
  neutrino: improve streaminfo2 for TD
  zapit: add command to get audio/video info for TD
dvb/zapit/src/zapit.cpp
dvb/zapit/src/zapost/video.cpp