Resolved conflicts + Assure having a symlink  libamcodec.so -> libamcodec.so.0.0*

Actually I have forgotten to check your other development branches -- may be both are fixed there -- but there you go as a reply to myself on http://www.j1nx.nl/bbtopic/g-box-midnight-2-2-custom-build-with-xbmc-12-2-illop-in-cdvdplayervideoprocessoverlays/

My develop branch has more minor changes, tomorrow will check it on the actual GBox