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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/filters/ffmpeg_glue.cc

Issue 7658017: Revert 96974 - Remove mock_ffmpeg and update media unittests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 months 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
« no previous file with comments | « media/filters/ffmpeg_glue.h ('k') | media/filters/ffmpeg_glue_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_glue.cc
===================================================================
--- media/filters/ffmpeg_glue.cc (revision 96976)
+++ media/filters/ffmpeg_glue.cc (working copy)
@@ -146,11 +146,6 @@
return Singleton<FFmpegGlue>::get();
}
-// static
-URLProtocol* FFmpegGlue::url_protocol() {
- return &kFFmpegURLProtocol;
-}
-
std::string FFmpegGlue::AddProtocol(FFmpegURLProtocol* protocol) {
base::AutoLock auto_lock(lock_);
std::string key = GetProtocolKey(protocol);
« no previous file with comments | « media/filters/ffmpeg_glue.h ('k') | media/filters/ffmpeg_glue_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698