am a66ca01a: am 4fc3e841: Merge "Adapt frame rate instead of keeping that...
am a66ca01a: am 4fc3e841: Merge "Adapt frame rate instead of keeping that constant and tweaking bitrate" into jb-mr2-dev
* commit 'a66ca01a':
Adapt frame rate instead of keeping that constant and tweaking bitrate