summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-30 17:33:29 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-30 17:33:29 +0000
commit87e8b111951074b524281b26b0a5812e8424d95a (patch)
treeb18a5299304a48b4e9112dabd40c516e8ae37d60
parent5c9250876fbe81ea49a9919804db4f3da33ef4a0 (diff)
downloadchromium_src-87e8b111951074b524281b26b0a5812e8424d95a.zip
chromium_src-87e8b111951074b524281b26b0a5812e8424d95a.tar.gz
chromium_src-87e8b111951074b524281b26b0a5812e8424d95a.tar.bz2
PinBase: Fix assign-to-self bug.
BUG=none TEST=none R=perkj Review URL: https://chromiumcodereview.appspot.com/9225049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119685 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--media/video/capture/win/pin_base_win.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/video/capture/win/pin_base_win.cc b/media/video/capture/win/pin_base_win.cc
index 551bd5c..7e2f7b0 100644
--- a/media/video/capture/win/pin_base_win.cc
+++ b/media/video/capture/win/pin_base_win.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -147,7 +147,7 @@ STDMETHODIMP PinBase::ReceiveConnection(IPin* connector,
if (!IsMediaTypeValid(media_type))
return VFW_E_TYPE_NOT_ACCEPTED;
- current_media_type_ = current_media_type_;
+ current_media_type_ = *media_type;
connector->AddRef();
connected_pin_.Attach(connector);
return S_OK;