Merge changes I42d7cbc5,I6eda8458

* changes:
  Add mp2 container and codec support
  Use header file for namespace functions