summaryrefslogtreecommitdiffstats
path: root/media/base
diff options
context:
space:
mode:
authorfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-22 02:17:44 +0000
committerfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-22 02:17:44 +0000
commit2706340c7a2f9a3a7405775b9e67d62fb3a56769 (patch)
tree7abfb9a98805a56f71dcac112dd17d667726463d /media/base
parenta9344c52433569d325d19e9ba52f8bb483fce0c0 (diff)
downloadchromium_src-2706340c7a2f9a3a7405775b9e67d62fb3a56769.zip
chromium_src-2706340c7a2f9a3a7405775b9e67d62fb3a56769.tar.gz
chromium_src-2706340c7a2f9a3a7405775b9e67d62fb3a56769.tar.bz2
Reimplement r122778 to fix BuildMediaStreamCollection without breaking HW video decode.
Review URL: http://codereview.chromium.org/9372075 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122950 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base')
-rw-r--r--media/base/filter_collection.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/media/base/filter_collection.cc b/media/base/filter_collection.cc
index f8a10f2..2a38f80 100644
--- a/media/base/filter_collection.cc
+++ b/media/base/filter_collection.cc
@@ -23,10 +23,6 @@ DemuxerFactory* FilterCollection::GetDemuxerFactory() {
}
void FilterCollection::AddVideoDecoder(VideoDecoder* filter) {
- scoped_refptr<media::VideoDecoder> old_videodecoder;
- do {
- SelectVideoDecoder(&old_videodecoder);
- } while (old_videodecoder);
AddFilter(VIDEO_DECODER, filter);
}