signalapp/webrtc
signalapp/webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
main
webrtc/api/crypto
History
Miriam Zimmerman 31a3397e96 Merge remote-tracking branch 'upstream/branch-heads/7778' into mutexlox/webrtc-148 
Merge conflicts resolved in:
* api/neteq/neteq.h
* audio/channel_receive.cc
* audio/channel_receive.h
* media/engine/simulcast_encoder_adapter.cc
* modules/audio_coding/BUILD.gn
* modules/audio_coding/acm2/acm_resampler.cc
* modules/audio_coding/acm2/acm_resampler_unittest.cc
* modules/audio_processing/audio_processing_impl.h
* modules/video_coding/BUILD.gn
* p2p/base/p2p_transport_channel_unittest.cc
* pc/jsep_transport_controller.cc
* pc/rtp_transport.h
* pc/rtp_transport_internal.h
* unsafe_buffers_paths.txt
2026-05-08 13:42:18 -04:00
..
BUILD.gn Replace ArrayView with std::span in api/ 2026-04-02 00:13:26 -07:00
crypto_options_unittest.cc Replace usages of ScopedKeyValueConfig with CreateTestFieldTrials 2025-06-30 05:48:41 -07:00
crypto_options.cc Replace erase-remove idiom with std::erase and std::erase_if. 2025-08-14 23:02:02 -07:00
crypto_options.h Merge remote-tracking branch 'upstream/branch-heads/7339' 2025-09-16 15:28:07 -07:00
frame_decryptor_interface.h Replace ArrayView with std::span in api/ 2026-04-02 00:13:26 -07:00
frame_encryptor_interface.h Replace ArrayView with std::span in api/ 2026-04-02 00:13:26 -07:00