FFmpeg: Only use LazyInstance at global scope

media/filters/ffmpeg_glue.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/filters/ffmpeg_glue.h"
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/synchronization/lock.h"
@@ skipping 100 matching lines @@
 
   ~FFmpegInitializer() {
     NOTREACHED() << "FFmpegInitializer should be leaky!";
   }
 
   bool initialized_;
 
   DISALLOW_COPY_AND_ASSIGN(FFmpegInitializer);
 };
 
+static base::LazyInstance<FFmpegInitializer>::Leaky lazy_instance =

[DaleCurtis, 2014/10/31 18:20:09]

g_ffmpeg_initializer ?

+    LAZY_INSTANCE_INITIALIZER;
 void FFmpegGlue::InitializeFFmpeg() {
-  static base::LazyInstance<FFmpegInitializer>::Leaky li =
-      LAZY_INSTANCE_INITIALIZER;
-  CHECK(li.Get().initialized());
+  // Get() will invoke the FFmpegInitializer constructor once.
+  CHECK(lazy_instance.Get().initialized());
 }
 
 FFmpegGlue::FFmpegGlue(FFmpegURLProtocol* protocol)
     : open_called_(false) {
   InitializeFFmpeg();
 
   // Initialize an AVIOContext using our custom read and seek operations.  Don't
   // keep pointers to the buffer since FFmpeg may reallocate it on the fly.  It
   // will be cleaned up
   format_context_ = avformat_alloc_context();
@@ skipping 78 matching lines @@
         avcodec_close(stream->codec);
       }
     }
   }
 
   avformat_close_input(&format_context_);
   av_free(avio_context_->buffer);
 }
 
 }  // namespace media