summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--webkit/media/filter_helpers.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/webkit/media/filter_helpers.cc b/webkit/media/filter_helpers.cc
index c6f5b2e..2c1b136 100644
--- a/webkit/media/filter_helpers.cc
+++ b/webkit/media/filter_helpers.cc
@@ -38,6 +38,11 @@ bool BuildMediaStreamCollection(const WebKit::WebURL& url,
if (!client)
return false;
+ scoped_refptr<media::VideoDecoder> video_decoder = client->GetVideoDecoder(
+ url, message_loop_factory);
+ if (!video_decoder)
+ return false;
+
// Remove any "traditional" decoders (e.g. GpuVideoDecoder) from the
// collection.
// NOTE: http://crbug.com/110800 is about replacing this ad-hockery with
@@ -47,11 +52,6 @@ bool BuildMediaStreamCollection(const WebKit::WebURL& url,
filter_collection->SelectVideoDecoder(&old_videodecoder);
} while (old_videodecoder);
- scoped_refptr<media::VideoDecoder> video_decoder = client->GetVideoDecoder(
- url, message_loop_factory);
- if (!video_decoder)
- return false;
-
filter_collection->AddVideoDecoder(video_decoder);
// TODO(vrk/wjia): Setting true for local_source is under the assumption