Fix RTPPayloadRegistry to correctly restore RTX, if a valid mapping exists.

webrtc/video_engine/vie_receiver.h

Index: webrtc/video_engine/vie_receiver.h
diff --git a/webrtc/video_engine/vie_receiver.h b/webrtc/video_engine/vie_receiver.h
index c7d4c33bba61dc078c4d7428b9e07ca78a25070f..cd069eaa5b1e041079628f79758082dc952c776c 100644
--- a/webrtc/video_engine/vie_receiver.h
+++ b/webrtc/video_engine/vie_receiver.h
@@ -46,6 +46,11 @@ class ViEReceiver : public RtpData {
 
   void SetNackStatus(bool enable, int max_nack_reordering_threshold);
   void SetRtxPayloadType(int payload_type, int associated_payload_type);
+  // If set to true, the RTX payload type mapping supplied in
+  // |SetRtxPayloadType| will be used when restoring RTX packets. Without it,
+  // RTX packets will always be restored to the last non-RTX packet payload type
+  // received.
+  void SetUseRtxPayloadMappingOnRestore(bool val);
   void SetRtxSsrc(uint32_t ssrc);
   bool GetRtxSsrc(uint32_t* ssrc) const;