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
80 lines
1.3 KiB
Plaintext
80 lines
1.3 KiB
Plaintext
*.DS_Store
|
|
*.Makefile
|
|
*.host.mk
|
|
*.ncb
|
|
*.ninja
|
|
*.props
|
|
*.pyc
|
|
*.rules
|
|
*.scons
|
|
*.sdf
|
|
*.sln
|
|
*.suo
|
|
*.target.mk
|
|
*.targets
|
|
*.user
|
|
*.vcproj
|
|
*.vcxproj
|
|
*.vcxproj.filters
|
|
*.vpj
|
|
*.vpw
|
|
*.vpwhistu
|
|
*.vtg
|
|
*.xcodeproj
|
|
*.xcworkspace
|
|
*_proto.xml
|
|
*_proto_cpp.xml
|
|
*~
|
|
\#*#
|
|
.*.sw?
|
|
.cache
|
|
.cipd
|
|
.clangd
|
|
.classpath
|
|
.cproject
|
|
.gdb_history
|
|
.gdbinit
|
|
.gemini
|
|
.landmines
|
|
.metadata
|
|
.project
|
|
.pydevproject
|
|
.settings
|
|
.siso_failed_targets
|
|
.sw?
|
|
/Makefile
|
|
/base
|
|
/build
|
|
/buildtools
|
|
/ios
|
|
/mojo
|
|
/out
|
|
/testing
|
|
/third_party
|
|
/tools
|
|
/tools_webrtc/android/profiling/flamegraph
|
|
/tools_webrtc/android/profiling/simpleperf
|
|
/tools_webrtc/audio_quality/linux/pesq
|
|
/tools_webrtc/audio_quality/linux/PolqaOem64
|
|
/tools_webrtc/audio_quality/mac/pesq
|
|
/tools_webrtc/audio_quality/win/*.exe
|
|
/tools_webrtc/audio_quality/win/*.dll
|
|
/tools_webrtc/video_quality_toolchain/linux/ffmpeg
|
|
/tools_webrtc/video_quality_toolchain/linux/zxing
|
|
/tools_webrtc/video_quality_toolchain/mac/ffmpeg
|
|
/tools_webrtc/video_quality_toolchain/mac/zxing
|
|
/tools_webrtc/video_quality_toolchain/win/*.dll
|
|
/tools_webrtc/video_quality_toolchain/win/*.exe
|
|
/rtc_tools/testing/*.zip
|
|
/rtc_tools/testing/*.gz
|
|
/rtc_tools/testing/golang/*/*.gz
|
|
/rtc_tools/testing/golang/*/*.zip
|
|
/rtc_tools/testing/webrtc_apprtc_browsertest/*
|
|
/rtc_tools/testing/browsertest/*
|
|
/x86-generic_out/
|
|
/xcodebuild
|
|
/.vscode
|
|
/.idea
|
|
!webrtc/*
|
|
rust-project.json
|