Merge branch 'fix/bundle-conflicting-ufrag' of github.com:pion/webrtc…

… into fix/bundle-conflicting-ufrag

examples/ice-restart/README.md

@@ -18,7 +18,7 @@ Execute `go run *.go`
 Open [http://localhost:8080](http://localhost:8080). This will automatically start a PeerConnection. This page will now prints stats about the PeerConnection
 and allow you to do an ICE Restart at anytime.
 
-* `ICE Restart` is the button that causes a new offer to be made wih `iceRestart: true`.
+* `ICE Restart` is the button that causes a new offer to be made with `iceRestart: true`.
 * `ICE Connection States` will contain all the connection states the PeerConnection moves through.
 * `ICE Selected Pairs` will print the selected pair every 3 seconds. Note how the uFrag/uPwd/Port change everytime you start the Restart process.
 * `Inbound DataChannel Messages` containing the current time sent by the Pion process every 3 seconds.

examples/whip-whep/main.go

@@ -4,7 +4,7 @@
 //go:build !js
 // +build !js
 
-// whip-whep demonstrates how to use the WHIP/WHEP specifications to exhange SPD descriptions and stream media to a WebRTC client in the browser or OBS
+// whip-whep demonstrates how to use the WHIP/WHEP specifications to exchange SPD descriptions and stream media to a WebRTC client in the browser or OBS
 package main
 
 import (

pkg/media/rtpdump/rtpdump.go

@@ -77,7 +77,7 @@ func (h *Header) Unmarshal(d []byte) error {
 // (relative to the Start of the recording in Header). The Payload may contain
 // truncated packets to support logging just the headers of RTP/RTCP packets.
 type Packet struct {
-	// Offset is the time since the start of recording in millseconds
+	// Offset is the time since the start of recording in milliseconds
 	Offset time.Duration
 	// IsRTCP is true if the payload is RTCP, false if the payload is RTP
 	IsRTCP bool

pkg/media/samplebuilder/samplebuilder_test.go

@@ -550,7 +550,7 @@ func TestSampleBuilder_Flush(t *testing.T) {
 	}) // Valid packet
 
 	if sample := s.Pop(); sample != nil {
-		t.Fatal("Unexpected sample is retuned. Test precondition may be broken")
+		t.Fatal("Unexpected sample is returned. Test precondition may be broken")
 	}
 
 	s.Flush()