Only initiate codec negotiation if feature is supported am: ecb3b8386f
am: 879ec51029

* commit '879ec51029302b25415dc1362f4e6b042cbf4980':
  Only initiate codec negotiation if feature is supported