diff --git a/client.go b/client.go
index 119b41b5..06ee2188 100644
--- a/client.go
+++ b/client.go
@@ -22,7 +22,7 @@ import (
 	"time"
 
 	"github.com/pion/rtcp"
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 
 	"github.com/aler9/gortsplib/pkg/auth"
 	"github.com/aler9/gortsplib/pkg/base"
diff --git a/client_publish_test.go b/client_publish_test.go
index 507b8e0f..86d847d9 100644
--- a/client_publish_test.go
+++ b/client_publish_test.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/pion/rtcp"
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 	"github.com/stretchr/testify/require"
 
 	"github.com/aler9/gortsplib/pkg/base"
diff --git a/client_read_test.go b/client_read_test.go
index 2d736fa7..05945351 100644
--- a/client_read_test.go
+++ b/client_read_test.go
@@ -12,7 +12,7 @@ import (
 	"time"
 
 	"github.com/pion/rtcp"
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/net/ipv4"
 
diff --git a/examples/client-publish-aac/main.go b/examples/client-publish-aac/main.go
index a1f17f5b..26d86e0f 100644
--- a/examples/client-publish-aac/main.go
+++ b/examples/client-publish-aac/main.go
@@ -5,7 +5,7 @@ import (
 	"net"
 
 	"github.com/aler9/gortsplib"
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 )
 
 // This example shows how to
diff --git a/examples/client-publish-h264/main.go b/examples/client-publish-h264/main.go
index 949c02b2..0fca60f7 100644
--- a/examples/client-publish-h264/main.go
+++ b/examples/client-publish-h264/main.go
@@ -5,7 +5,7 @@ import (
 	"net"
 
 	"github.com/aler9/gortsplib"
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 )
 
 // This example shows how to
diff --git a/examples/client-publish-options/main.go b/examples/client-publish-options/main.go
index cba37934..84433fff 100644
--- a/examples/client-publish-options/main.go
+++ b/examples/client-publish-options/main.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/aler9/gortsplib"
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 )
 
 // This example shows how to
diff --git a/examples/client-publish-opus/main.go b/examples/client-publish-opus/main.go
index 123b47f6..59dad6b6 100644
--- a/examples/client-publish-opus/main.go
+++ b/examples/client-publish-opus/main.go
@@ -5,7 +5,7 @@ import (
 	"net"
 
 	"github.com/aler9/gortsplib"
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 )
 
 // This example shows how to
diff --git a/examples/client-publish-pause/main.go b/examples/client-publish-pause/main.go
index 4755db25..879603c2 100644
--- a/examples/client-publish-pause/main.go
+++ b/examples/client-publish-pause/main.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/aler9/gortsplib"
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 )
 
 // This example shows how to
diff --git a/examples/client-publish-pcmu/main.go b/examples/client-publish-pcmu/main.go
index baa9c3a8..86037d5c 100644
--- a/examples/client-publish-pcmu/main.go
+++ b/examples/client-publish-pcmu/main.go
@@ -5,7 +5,7 @@ import (
 	"net"
 
 	"github.com/aler9/gortsplib"
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 )
 
 // This example shows how to
diff --git a/examples/client-read-aac/main.go b/examples/client-read-aac/main.go
index 1af185ba..0626fb6f 100644
--- a/examples/client-read-aac/main.go
+++ b/examples/client-read-aac/main.go
@@ -6,7 +6,7 @@ import (
 	"github.com/aler9/gortsplib"
 	"github.com/aler9/gortsplib/pkg/base"
 	"github.com/aler9/gortsplib/pkg/rtpaac"
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 )
 
 // This example shows how to
diff --git a/examples/client-read-h264-convert-to-jpeg/main.go b/examples/client-read-h264-convert-to-jpeg/main.go
index b0f0487d..8f5bd475 100644
--- a/examples/client-read-h264-convert-to-jpeg/main.go
+++ b/examples/client-read-h264-convert-to-jpeg/main.go
@@ -11,7 +11,7 @@ import (
 	"github.com/aler9/gortsplib"
 	"github.com/aler9/gortsplib/pkg/base"
 	"github.com/aler9/gortsplib/pkg/rtph264"
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 )
 
 // This example shows how to
diff --git a/examples/client-read-h264-save-to-disk/main.go b/examples/client-read-h264-save-to-disk/main.go
index 52f26703..cf43eaa2 100644
--- a/examples/client-read-h264-save-to-disk/main.go
+++ b/examples/client-read-h264-save-to-disk/main.go
@@ -4,7 +4,7 @@ import (
 	"github.com/aler9/gortsplib"
 	"github.com/aler9/gortsplib/pkg/base"
 	"github.com/aler9/gortsplib/pkg/rtph264"
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 )
 
 // This example shows how to
diff --git a/examples/client-read-h264/main.go b/examples/client-read-h264/main.go
index ebc22ada..f9295534 100644
--- a/examples/client-read-h264/main.go
+++ b/examples/client-read-h264/main.go
@@ -6,7 +6,7 @@ import (
 	"github.com/aler9/gortsplib"
 	"github.com/aler9/gortsplib/pkg/base"
 	"github.com/aler9/gortsplib/pkg/rtph264"
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 )
 
 // This example shows how to
diff --git a/examples/client-read-options/main.go b/examples/client-read-options/main.go
index f440853a..dfb59dde 100644
--- a/examples/client-read-options/main.go
+++ b/examples/client-read-options/main.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/aler9/gortsplib"
 	"github.com/pion/rtcp"
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 )
 
 // This example shows how to
diff --git a/examples/client-read-partial/main.go b/examples/client-read-partial/main.go
index da7312f9..67350bfb 100644
--- a/examples/client-read-partial/main.go
+++ b/examples/client-read-partial/main.go
@@ -6,7 +6,7 @@ import (
 	"github.com/aler9/gortsplib"
 	"github.com/aler9/gortsplib/pkg/base"
 	"github.com/pion/rtcp"
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 )
 
 // This example shows how to
diff --git a/examples/client-read-pause/main.go b/examples/client-read-pause/main.go
index 2c808bba..29df792c 100644
--- a/examples/client-read-pause/main.go
+++ b/examples/client-read-pause/main.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/aler9/gortsplib"
 	"github.com/pion/rtcp"
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 )
 
 // This example shows how to
diff --git a/examples/client-read-republish/main.go b/examples/client-read-republish/main.go
index 815ea1c1..febff98c 100644
--- a/examples/client-read-republish/main.go
+++ b/examples/client-read-republish/main.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/aler9/gortsplib"
 	"github.com/aler9/gortsplib/pkg/base"
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 )
 
 // This example shows how to
diff --git a/examples/client-read/main.go b/examples/client-read/main.go
index 97966aaa..a852bdbe 100644
--- a/examples/client-read/main.go
+++ b/examples/client-read/main.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/aler9/gortsplib"
 	"github.com/pion/rtcp"
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 )
 
 // This example shows how to connect to a RTSP server
diff --git a/go.mod b/go.mod
index 5c07b695..a40c23ee 100644
--- a/go.mod
+++ b/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/asticode/go-astits v1.10.0
 	github.com/icza/bitio v1.0.0
 	github.com/pion/rtcp v1.2.9
-	github.com/pion/rtp/v2 v2.0.0-20220302185659-b3d10fc096b0
+	github.com/pion/rtp v1.7.9
 	github.com/pion/sdp/v3 v3.0.2
 	github.com/stretchr/testify v1.7.0
 	golang.org/x/net v0.0.0-20210610132358-84b48f89b13b
diff --git a/go.sum b/go.sum
index 6a0790d8..578aca7d 100644
--- a/go.sum
+++ b/go.sum
@@ -12,8 +12,8 @@ github.com/pion/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA=
 github.com/pion/randutil v0.1.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8=
 github.com/pion/rtcp v1.2.9 h1:1ujStwg++IOLIEoOiIQ2s+qBuJ1VN81KW+9pMPsif+U=
 github.com/pion/rtcp v1.2.9/go.mod h1:qVPhiCzAm4D/rxb6XzKeyZiQK69yJpbUDJSF7TgrqNo=
-github.com/pion/rtp/v2 v2.0.0-20220302185659-b3d10fc096b0 h1:zyOGxHutZ6IhksQSMtwf3OFXB29W5R18yFQWOQJYWjU=
-github.com/pion/rtp/v2 v2.0.0-20220302185659-b3d10fc096b0/go.mod h1:Vj+rrFbJCT3yxqE/VSwaOo9DQ2pMKGPxuE7hplGOlOs=
+github.com/pion/rtp v1.7.9 h1:17W5Mt2IM3MVfOh7yRfzXbbKXYzBZxV8eG4KKAy+0bg=
+github.com/pion/rtp v1.7.9/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko=
 github.com/pion/sdp/v3 v3.0.2 h1:UNnSPVaMM+Pdu/mR9UvAyyo6zkdYbKeuOooCwZvTl/g=
 github.com/pion/sdp/v3 v3.0.2/go.mod h1:bNiSknmJE0HYBprTHXKPQ3+JjacTv5uap92ueJZKsRk=
 github.com/pkg/profile v1.4.0/go.mod h1:NWz/XGvpEW1FyYQ7fCx4dqYBLlfTcE+A9FLAkNKqjFE=
diff --git a/pkg/rtcpreceiver/rtcpreceiver.go b/pkg/rtcpreceiver/rtcpreceiver.go
index 285b5709..1083c0a1 100644
--- a/pkg/rtcpreceiver/rtcpreceiver.go
+++ b/pkg/rtcpreceiver/rtcpreceiver.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/pion/rtcp"
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 )
 
 func randUint32() uint32 {
diff --git a/pkg/rtcpreceiver/rtcpreceiver_test.go b/pkg/rtcpreceiver/rtcpreceiver_test.go
index 17051328..1c114a3e 100644
--- a/pkg/rtcpreceiver/rtcpreceiver_test.go
+++ b/pkg/rtcpreceiver/rtcpreceiver_test.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/pion/rtcp"
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/pkg/rtcpsender/rtcpsender.go b/pkg/rtcpsender/rtcpsender.go
index 89c774a0..9247cf70 100644
--- a/pkg/rtcpsender/rtcpsender.go
+++ b/pkg/rtcpsender/rtcpsender.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/pion/rtcp"
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 )
 
 var now = time.Now
diff --git a/pkg/rtcpsender/rtcpsender_test.go b/pkg/rtcpsender/rtcpsender_test.go
index f7a9bb50..f50d310e 100644
--- a/pkg/rtcpsender/rtcpsender_test.go
+++ b/pkg/rtcpsender/rtcpsender_test.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/pion/rtcp"
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/pkg/rtpaac/decoder.go b/pkg/rtpaac/decoder.go
index cdf0265f..f530c5ae 100644
--- a/pkg/rtpaac/decoder.go
+++ b/pkg/rtpaac/decoder.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 
 	"github.com/aler9/gortsplib/pkg/rtptimedec"
 )
diff --git a/pkg/rtpaac/encoder.go b/pkg/rtpaac/encoder.go
index e48d4497..d0a81626 100644
--- a/pkg/rtpaac/encoder.go
+++ b/pkg/rtpaac/encoder.go
@@ -5,7 +5,7 @@ import (
 	"encoding/binary"
 	"time"
 
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 )
 
 const (
diff --git a/pkg/rtpaac/rtpaac_test.go b/pkg/rtpaac/rtpaac_test.go
index 890675ed..46212b65 100644
--- a/pkg/rtpaac/rtpaac_test.go
+++ b/pkg/rtpaac/rtpaac_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/pkg/rtph264/decoder.go b/pkg/rtph264/decoder.go
index 059888fe..ce19bc2b 100644
--- a/pkg/rtph264/decoder.go
+++ b/pkg/rtph264/decoder.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 
 	"github.com/aler9/gortsplib/pkg/rtptimedec"
 )
diff --git a/pkg/rtph264/encoder.go b/pkg/rtph264/encoder.go
index 3b4d9cf6..d286c322 100644
--- a/pkg/rtph264/encoder.go
+++ b/pkg/rtph264/encoder.go
@@ -5,7 +5,7 @@ import (
 	"encoding/binary"
 	"time"
 
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 )
 
 const (
diff --git a/pkg/rtph264/rtph264_test.go b/pkg/rtph264/rtph264_test.go
index ed5cecad..e0e1879f 100644
--- a/pkg/rtph264/rtph264_test.go
+++ b/pkg/rtph264/rtph264_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/rtppacketmultibuffer.go b/rtppacketmultibuffer.go
index c2a70677..a36f2233 100644
--- a/rtppacketmultibuffer.go
+++ b/rtppacketmultibuffer.go
@@ -1,7 +1,7 @@
 package gortsplib
 
 import (
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 )
 
 type rtpPacketMultiBuffer struct {
diff --git a/server_publish_test.go b/server_publish_test.go
index c0843757..d388c220 100644
--- a/server_publish_test.go
+++ b/server_publish_test.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/pion/rtcp"
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 	psdp "github.com/pion/sdp/v3"
 	"github.com/stretchr/testify/require"
 
diff --git a/server_read_test.go b/server_read_test.go
index f80d872a..44ba5fdb 100644
--- a/server_read_test.go
+++ b/server_read_test.go
@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"github.com/pion/rtcp"
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 	psdp "github.com/pion/sdp/v3"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/net/ipv4"
diff --git a/serverhandler.go b/serverhandler.go
index bc7dcb1d..2372d60e 100644
--- a/serverhandler.go
+++ b/serverhandler.go
@@ -2,7 +2,7 @@ package gortsplib
 
 import (
 	"github.com/pion/rtcp"
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 
 	"github.com/aler9/gortsplib/pkg/base"
 )
diff --git a/serversession.go b/serversession.go
index 12298454..867d1a07 100644
--- a/serversession.go
+++ b/serversession.go
@@ -12,7 +12,7 @@ import (
 	"time"
 
 	"github.com/pion/rtcp"
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 
 	"github.com/aler9/gortsplib/pkg/base"
 	"github.com/aler9/gortsplib/pkg/headers"
diff --git a/serverstream.go b/serverstream.go
index 12067f1c..1e353f66 100644
--- a/serverstream.go
+++ b/serverstream.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/pion/rtcp"
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 
 	"github.com/aler9/gortsplib/pkg/liberrors"
 	"github.com/aler9/gortsplib/pkg/rtcpsender"