Fix bug in calculating number of mbs with scaling.
Fix bug in calculating number of mbs with scaling.

Correct calculation of number of mbs in two pass code when
frame resizing is enabled. Always use initial number of mbs if
scaling is enabled, as this is what was used in the first pass.

Change-Id: I49a4280ab5a8b1000efcc157a449a081cbb6d410

altogother/webm.libvpx,pcwalton/libvpx,kleopatra999/webm.libvpx,felipebetancur/libvpx,charup/https---github.com-webmproject-libvpx-,Laknot/libvpx,abwiz0086/webm.libvpx,Laknot/libvpx,lyx2014/libvpx_c,ittiamvpx/libvpx-1,kalli123/webm.libvpx,luctrudeau/aom,kim42083/webm.libvpx,mbebenita/aom,matanbs/webm.libvpx,abwiz0086/webm.libvpx,Acidburn0zzz/webm.libvpx,ShiftMediaProject/libvpx,running770/libvpx,jmvalin/aom,Acidburn0zzz/webm.libvpx,charup/https---github.com-webmproject-libvpx-,liqianggao/libvpx,iniwf/webm.libvpx,mwgoldsmith/libvpx,thdav/aom,Distrotech/libvpx,zofuthan/libvpx,iniwf/webm.libvpx,mwgoldsmith/vpx,pcwalton/libvpx,matanbs/vp982,stewnorriss/libvpx,openpeer/libvpx_new,GrokImageCompression/aom,matanbs/webm.libvpx,matanbs/vp982,liqianggao/libvpx,Acidburn0zzz/webm.libvpx,jmvalin/aom,kleopatra999/webm.libvpx,shacklettbp/aom,Distrotech/libvpx,luctrudeau/aom,matanbs/vp982,Laknot/libvpx,hsueceumd/test_hui,gshORTON/webm.libvpx,running770/libvpx,Laknot/libvpx,zofuthan/libvpx,shacklettbp/aom,goodleixiao/vpx,charup/https---github.com-webmproject-libvpx-,gshORTON/webm.libvpx,jacklicn/webm.libvpx,openpeer/libvpx_new,GrokImageCompression/aom,openpeer/libvpx_new,matanbs/vp982,shacklettbp/aom,Suvarna1488/webm.libvpx,mbebenita/aom,Topopiccione/libvpx,jdm/libvpx,jmvalin/aom,jmvalin/aom,VTCSecureLLC/libvpx,Laknot/libvpx,matanbs/webm.libvpx,ShiftMediaProject/libvpx,Distrotech/libvpx,smarter/aom,lyx2014/libvpx_c,stewnorriss/libvpx,jdm/libvpx,Topopiccione/libvpx,VTCSecureLLC/libvpx,shareefalis/libvpx,liqianggao/libvpx,mwgoldsmith/vpx,webmproject/libvpx,kalli123/webm.libvpx,goodleixiao/vpx,luctrudeau/aom,abwiz0086/webm.libvpx,shareefalis/libvpx,charup/https---github.com-webmproject-libvpx-,hsueceumd/test_hui,ittiamvpx/libvpx-1,shacklettbp/aom,thdav/aom,jacklicn/webm.libvpx,shacklettbp/aom,zofuthan/libvpx,webmproject/libvpx,liqianggao/libvpx,goodleixiao/vpx,shareefalis/libvpx,webmproject/libvpx,lyx2014/libvpx_c,stewnorriss/libvpx,jdm/libvpx,VTCSecureLLC/libvpx,GrokImageCompression/aom,jacklicn/webm.libvpx,felipebetancur/libvpx,lyx2014/libvpx_c,GrokImageCompression/aom,matanbs/webm.libvpx,Acidburn0zzz/webm.libvpx,thdav/aom,kim42083/webm.libvpx,VTCSecureLLC/libvpx,smarter/aom,reimaginemedia/webm.libvpx,jacklicn/webm.libvpx,ShiftMediaProject/libvpx,VTCSecureLLC/libvpx,gshORTON/webm.libvpx,Maria1099/webm.libvpx,iniwf/webm.libvpx,luctrudeau/aom,hsueceumd/test_hui,altogother/webm.libvpx,mbebenita/aom,abwiz0086/webm.libvpx,mwgoldsmith/vpx,pcwalton/libvpx,Maria1099/webm.libvpx,mwgoldsmith/vpx,mwgoldsmith/libvpx,gshORTON/webm.libvpx,shareefalis/libvpx,felipebetancur/libvpx,Maria1099/webm.libvpx,zofuthan/libvpx,kalli123/webm.libvpx,pcwalton/libvpx,Topopiccione/libvpx,luctrudeau/aom,altogother/webm.libvpx,matanbs/webm.libvpx,Maria1099/webm.libvpx,ShiftMediaProject/libvpx,goodleixiao/vpx,jacklicn/webm.libvpx,kalli123/webm.libvpx,stewnorriss/libvpx,openpeer/libvpx_new,matanbs/webm.libvpx,ShiftMediaProject/libvpx,shyamalschandra/libvpx,shyamalschandra/libvpx,mbebenita/aom,altogother/webm.libvpx,reimaginemedia/webm.libvpx,mwgoldsmith/vpx,webmproject/libvpx,ittiamvpx/libvpx-1,goodleixiao/vpx,thdav/aom,pcwalton/libvpx,webmproject/libvpx,mwgoldsmith/vpx,GrokImageCompression/aom,GrokImageCompression/aom,hsueceumd/test_hui,jacklicn/webm.libvpx,lyx2014/libvpx_c,ittiamvpx/libvpx-1,shareefalis/libvpx,smarter/aom,Laknot/libvpx,kleopatra999/webm.libvpx,ittiamvpx/libvpx-1,VTCSecureLLC/libvpx,hsueceumd/test_hui,running770/libvpx,felipebetancur/libvpx,kalli123/webm.libvpx,felipebetancur/libvpx,jdm/libvpx,mwgoldsmith/libvpx,Topopiccione/libvpx,mwgoldsmith/libvpx,shareefalis/libvpx,altogother/webm.libvpx,ittiamvpx/libvpx-1,zofuthan/libvpx,felipebetancur/libvpx,shyamalschandra/libvpx,jmvalin/aom,goodleixiao/vpx,Acidburn0zzz/webm.libvpx,Suvarna1488/webm.libvpx,kalli123/webm.libvpx,running770/libvpx,mbebenita/aom,reimaginemedia/webm.libvpx,liqianggao/libvpx,luctrudeau/aom,iniwf/webm.libvpx,gshORTON/webm.libvpx,Distrotech/libvpx,openpeer/libvpx_new,mbebenita/aom,kleopatra999/webm.libvpx,reimaginemedia/webm.libvpx,smarter/aom,pcwalton/libvpx,Suvarna1488/webm.libvpx,lyx2014/libvpx_c,webmproject/libvpx,mbebenita/aom,kim42083/webm.libvpx,abwiz0086/webm.libvpx,openpeer/libvpx_new,Topopiccione/libvpx,Distrotech/libvpx,mbebenita/aom,liqianggao/libvpx,altogother/webm.libvpx,kleopatra999/webm.libvpx,Acidburn0zzz/webm.libvpx,mwgoldsmith/libvpx,mwgoldsmith/libvpx,stewnorriss/libvpx,kim42083/webm.libvpx,matanbs/vp982,thdav/aom,iniwf/webm.libvpx,matanbs/vp982,kleopatra999/webm.libvpx,stewnorriss/libvpx,Maria1099/webm.libvpx,Distrotech/libvpx,smarter/aom,jdm/libvpx,shyamalschandra/libvpx,reimaginemedia/webm.libvpx,zofuthan/libvpx,Maria1099/webm.libvpx,thdav/aom,charup/https---github.com-webmproject-libvpx-,mbebenita/aom,jdm/libvpx,Topopiccione/libvpx,matanbs/vp982,abwiz0086/webm.libvpx,running770/libvpx,reimaginemedia/webm.libvpx,jmvalin/aom,smarter/aom,Suvarna1488/webm.libvpx,shyamalschandra/libvpx,hsueceumd/test_hui,iniwf/webm.libvpx,shyamalschandra/libvpx,kim42083/webm.libvpx,Suvarna1488/webm.libvpx,shacklettbp/aom,running770/libvpx,gshORTON/webm.libvpx,charup/https---github.com-webmproject-libvpx-,kim42083/webm.libvpx,Suvarna1488/webm.libvpx