Include additional changes for media processing
Merge pull request #2 from rongyan-square/devel

Include additional changes for media processing