From 23730a6e56a168d1879203e4b3819bb36e3d8f1f Mon Sep 17 00:00:00 2001 From: "Torne (Richard Coles)" Date: Fri, 21 Mar 2014 14:25:57 +0000 Subject: Merge from Chromium at DEPS revision 258528 This commit was generated by merge_to_master.py. Change-Id: Id197cbdde2c2881915f096c0426c741416884783 --- media/filters/frame_processor_base.cc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'media/filters/frame_processor_base.cc') diff --git a/media/filters/frame_processor_base.cc b/media/filters/frame_processor_base.cc index 34db474bfe..3e088ed5dc 100644 --- a/media/filters/frame_processor_base.cc +++ b/media/filters/frame_processor_base.cc @@ -25,12 +25,8 @@ void MseTrackBuffer::Reset() { needs_random_access_point_ = true; } -FrameProcessorBase::FrameProcessorBase( - const IncreaseDurationCB& increase_duration_cb) - : sequence_mode_(false), - increase_duration_cb_(increase_duration_cb) { - DCHECK(!increase_duration_cb_.is_null()); -} +FrameProcessorBase::FrameProcessorBase() + : sequence_mode_(false) {} FrameProcessorBase::~FrameProcessorBase() { DVLOG(2) << __FUNCTION__ << "()"; -- cgit v1.2.3