Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2643)

Unified Diff: media/filters/ffmpeg_glue.cc

Issue 5581008: Add a new GetInstance() method for singleton classes, take 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/filters/ffmpeg_glue.cc
diff --git a/media/filters/ffmpeg_glue.cc b/media/filters/ffmpeg_glue.cc
index 6f637c3fa7337f388d39f84112caa397b3e81b89..663fff73eaa83cbc4f180f8a443899e203108ac2 100644
--- a/media/filters/ffmpeg_glue.cc
+++ b/media/filters/ffmpeg_glue.cc
@@ -16,7 +16,7 @@ media::FFmpegURLProtocol* ToProtocol(void* data) {
// FFmpeg protocol interface.
int OpenContext(URLContext* h, const char* filename, int flags) {
media::FFmpegURLProtocol* protocol;
- media::FFmpegGlue::get()->GetProtocol(filename, &protocol);
+ media::FFmpegGlue::GetInstance()->GetProtocol(filename, &protocol);
if (!protocol)
return AVERROR_IO;
@@ -145,6 +145,11 @@ FFmpegGlue::~FFmpegGlue() {
av_lockmgr_register(NULL);
}
+// static
+FFmpegGlue* FFmpegGlue::GetInstance() {
+ return Singleton<FFmpegGlue>::get();
+}
+
std::string FFmpegGlue::AddProtocol(FFmpegURLProtocol* protocol) {
AutoLock auto_lock(lock_);
std::string key = GetProtocolKey(protocol);

Powered by Google App Engine
This is Rietveld 408576698