Update sbplayer_interface.h

youtube · Apr 22, 2024 · c47d3f6 · c47d3f6
1 parent 92b515c
commit c47d3f6
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/cobalt/media/base/sbplayer_interface.h b/cobalt/media/base/sbplayer_interface.h
@@ -92,12 +92,8 @@ class SbPlayerInterface {
     cval_stats_.Enable(should_enable);
   }
   CValStats cval_stats_;
-<<<<<<< HEAD
-=======
-  MediaMetricsProvider media_metrics_provider_;
 
   void SetDecodeToTexturePreferred(bool preferred);
->>>>>>> aada42d31c7 (Add decode to texture preferred option (#3011))
 };
 
 class DefaultSbPlayerInterface final : public SbPlayerInterface {