diff options
| author | Jordan Bayles <jophba@chromium.org> | 2021-06-29 03:59:26 -0700 |
|---|---|---|
| committer | Jordan Bayles <jophba@chromium.org> | 2021-06-29 16:38:38 +0000 |
| commit | 8a7173ad36859154874c17b107b450ee261a3697 (patch) | |
| tree | 3a1b03b94b0e6c8fced9c18d1f01b883b8025a92 | |
| parent | 12857d42aeff125c69488ef3554f92c4951f2358 (diff) | |
| download | openscreen-8a7173ad36859154874c17b107b450ee261a3697.tar.gz | |
[Cast] Fix merge conflict
An incorrect merge resolution causes a compile error on some compilers.
This patch is a simple fix for the standalone sender build.
Change-Id: I2673386434a7bdbee553b75dc52adf8610ce7137
Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/2994462
Reviewed-by: Ryan Keane <rwkeane@google.com>
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | cast/standalone_sender/main.cc | 3 |
2 files changed, 3 insertions, 2 deletions
@@ -127,7 +127,7 @@ deps = { 'third_party/chromium_quic/src': { 'url': Var('chromium_git') + '/openscreen/quic.git' + - '@' + '444faf6e3ae0dcade48438144f7e8ea2f8b3436d', + '@' + '79eec3fc28f5c4e1d06c6146825e31def6e3b793', 'condition': 'not build_with_chromium', }, diff --git a/cast/standalone_sender/main.cc b/cast/standalone_sender/main.cc index b7757d97..228c00b1 100644 --- a/cast/standalone_sender/main.cc +++ b/cast/standalone_sender/main.cc @@ -227,7 +227,8 @@ int StandaloneSenderMain(int argc, char* argv[]) { .max_bitrate = max_bitrate, .should_include_video = true, .use_android_rtp_hack = use_android_rtp_hack, - .use_remoting = use_remoting}); + .use_remoting = use_remoting, + .should_loop_video = should_loop_video}); }); // Run the event loop until SIGINT (e.g., CTRL-C at the console) or |