am c120d033: Merge "The framework really doesn\'t need to know the specifics of the codec" into jb-mr2-dev

* commit 'c120d033c011e5943e74b6cde638d15fd02eb5b9':
  The framework really doesn't need to know the specifics of the codec