diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2012-08-09 20:54:52 +1000 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2012-08-09 20:54:52 +1000 |
commit | 10011add9c6333a10483f079c327e271bbaac1a0 (patch) | |
tree | a33d17f1124a60786b9891fdfca9af720e2c9f95 | |
parent | 8c17475ce13f4c3dfb4b68e7e0c19ed401362461 (diff) | |
parent | 5ef1bbe0457c9e5041d76ecb6560a2660b1bc1e5 (diff) |
Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-systeminfo into master-integration
* 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-systeminfo:
Fix for missing 1920x1088 video resolution for Nokia PureView 808
-rw-r--r-- | plugins/multimedia/symbian/ecam/s60cameraconstants.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/multimedia/symbian/ecam/s60cameraconstants.h b/plugins/multimedia/symbian/ecam/s60cameraconstants.h index 05c6de11e7..77b9127601 100644 --- a/plugins/multimedia/symbian/ecam/s60cameraconstants.h +++ b/plugins/multimedia/symbian/ecam/s60cameraconstants.h @@ -172,7 +172,7 @@ const QSize KResH264_PLID_428016 = QSize(640,480); const QSize KResH264_PLID_42801E = QSize(640,480); const QSize KResH264_PLID_42801F = QSize(1280,720); const QSize KResH264_PLID_428020 = QSize(1280,720); -const QSize KResH264_PLID_428028 = QSize(1920,1080); +const QSize KResH264_PLID_428028 = QSize(1920,1088); // Maximum framerates for encoder MIME Types // H.263 |