Merge commit '6b52911cc7ba548fd3a240ca61eba510a8581e6f' * commit '6b52911cc7ba548fd3a240ca61eba510a8581e6f': Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr.
Merge commit '6b52911cc7ba548fd3a240ca61eba510a8581e6f' * commit '6b52911cc7ba548fd3a240ca61eba510a8581e6f': Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr.