continued refactor.
Cleaned up some stuff left over from changing over the media decoder/encoder structure.