Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integr...
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 26 Mar 2010 05:50:54 +0000 (06:50 +0100)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 26 Mar 2010 05:50:54 +0000 (06:50 +0100)
commitfd330a5a6009c17e28fb9eb36b5bffbc19c5df68
tree16025a01c1aa172fb497b31c3bf8f8fc4edf691c
parentc55ac19acfcad0e204d9e9dc47fb4bf891924e0a
parent31461202c1ee2979f88f9642192ab53a2bc7e8cf
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
  Don't specify a BottomToTop scan line direction for YUV frames.
  Support expanding aspect ratio in direct show video window control.
  Support the Expanding aspect ratio mode in the gstreamer window control.