diff options
author | Torne (Richard Coles) <torne@google.com> | 2014-03-21 14:25:57 +0000 |
---|---|---|
committer | Torne (Richard Coles) <torne@google.com> | 2014-03-21 14:25:57 +0000 |
commit | 23730a6e56a168d1879203e4b3819bb36e3d8f1f (patch) | |
tree | 4b72bdd217f9beda1d1b975e21c9d646a9664c48 /media/filters/frame_processor_base.cc | |
parent | 6d6d338a36340632714f2aab9a266979b71c3442 (diff) | |
download | chromium_org-23730a6e56a168d1879203e4b3819bb36e3d8f1f.tar.gz |
Merge from Chromium at DEPS revision 258528
This commit was generated by merge_to_master.py.
Change-Id: Id197cbdde2c2881915f096c0426c741416884783
Diffstat (limited to 'media/filters/frame_processor_base.cc')
-rw-r--r-- | media/filters/frame_processor_base.cc | 8 |
1 files changed, 2 insertions, 6 deletions
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__ << "()"; |