| 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);
|
|
|