| Index: webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
|
| diff --git a/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc b/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
|
| index 290df944bde45d5b9d5c3e96848f1b5f16203283..b71347e87e8f81e9d2b80441f28e20ee4b46d07d 100644
|
| --- a/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
|
| +++ b/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
|
| @@ -52,8 +52,8 @@ bool ffmpeg_initialized = false;
|
| // Called by FFmpeg to do mutex operations if initialized using
|
| // |InitializeFFmpeg|. Disabling thread safety analysis because void** does not
|
| // play nicely with thread_annotations.h macros.
|
| -int LockManagerOperation(void** lock, AVLockOp op)
|
| - NO_THREAD_SAFETY_ANALYSIS {
|
| +int LockManagerOperation(void** lock,
|
| + AVLockOp op) RTC_NO_THREAD_SAFETY_ANALYSIS {
|
| switch (op) {
|
| case AV_LOCK_CREATE:
|
| *lock = new rtc::CriticalSection();
|
|
|