Merge remote-tracking branch 'origin/tracking' into custom

2026-09-23 08:57:34 +09:00 · 2023-03-28 09:30:21 +08:00 · 2023-03-28 09:30:21 +08:00 · 39d69840bf
commit 39d69840bf
parent 77fe104113 2554a83d1d
20 changed files with 3240 additions and 2241 deletions
--- a/media/webrtc/signaling/src/mediapipeline/MediaPipeline.h
+++ b/media/webrtc/signaling/src/mediapipeline/MediaPipeline.h
@ -22,6 +22,7 @@
 #include "transportflow.h"
 #include "AudioPacketizer.h"
 #include "StreamTracks.h"
+#include "webrtc/base/basictypes.h"

 #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"

--- a/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/audio_encoder.h
+++ b/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/audio_encoder.h
@ -13,6 +13,7 @@

 #include <algorithm>
 #include <vector>
+#include <limits>

 #include "webrtc/base/array_view.h"
 #include "webrtc/typedefs.h"