diff options
author | Moonchild <moonchild@palemoon.org> | 2020-09-23 23:45:46 +0000 |
---|---|---|
committer | Moonchild <moonchild@palemoon.org> | 2020-09-23 23:45:46 +0000 |
commit | 9f5c27ba479c54d4ebb1bd59b61fbf793f6df93f (patch) | |
tree | 831e0ae1649d6135429def03688bc93ff7c86b03 /dom/media/MediaStreamGraphImpl.h | |
parent | 42f895f27f239e973c9c06241f7a58da7381353c (diff) | |
parent | f624bd1375655dea196cdcb70a9860bc5817df49 (diff) | |
download | UXP-f583969f6ffe8f2dbd525dd3dc55d25347d7c492.tar UXP-f583969f6ffe8f2dbd525dd3dc55d25347d7c492.tar.gz UXP-f583969f6ffe8f2dbd525dd3dc55d25347d7c492.tar.lz UXP-f583969f6ffe8f2dbd525dd3dc55d25347d7c492.tar.xz UXP-f583969f6ffe8f2dbd525dd3dc55d25347d7c492.zip |
Merge branch 'redwood' into releaseRELBASE_20200929RC_20200924
Diffstat (limited to 'dom/media/MediaStreamGraphImpl.h')
-rw-r--r-- | dom/media/MediaStreamGraphImpl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dom/media/MediaStreamGraphImpl.h b/dom/media/MediaStreamGraphImpl.h index c71975493..b3d7d8701 100644 --- a/dom/media/MediaStreamGraphImpl.h +++ b/dom/media/MediaStreamGraphImpl.h @@ -652,7 +652,7 @@ public: * and boolean to control if we want input/output */ bool mInputWanted; - int mInputDeviceID; + Atomic<int> mInputDeviceID; bool mOutputWanted; int mOutputDeviceID; // Maps AudioDataListeners to a usecount of streams using the listener |