diff options
| author | Ben Murdoch <benm@google.com> | 2014-04-16 11:17:03 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-04-16 11:17:03 +0100 |
| commit | a02191e04bc25c4935f804f2c080ae28663d096d (patch) | |
| tree | 3cf38961650b5734763e473336009287244306ac /media/filters/vpx_video_decoder.cc | |
| parent | 8bad47e0f7d0c250a0443923cceb52f4a4abcd40 (diff) | |
| download | chromium_org-a02191e04bc25c4935f804f2c080ae28663d096d.tar.gz | |
Merge from Chromium at DEPS revision 263965
This commit was generated by merge_to_master.py.
Change-Id: Ia1121eddd985123f160afde6372525c3d25975bf
Diffstat (limited to 'media/filters/vpx_video_decoder.cc')
| -rw-r--r-- | media/filters/vpx_video_decoder.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/media/filters/vpx_video_decoder.cc b/media/filters/vpx_video_decoder.cc index 286629d822..861dd0e405 100644 --- a/media/filters/vpx_video_decoder.cc +++ b/media/filters/vpx_video_decoder.cc @@ -340,10 +340,6 @@ void VpxVideoDecoder::Stop() { state_ = kUninitialized; } -bool VpxVideoDecoder::HasAlpha() const { - return vpx_codec_alpha_ != NULL; -} - void VpxVideoDecoder::DecodeBuffer(const scoped_refptr<DecoderBuffer>& buffer) { DCHECK(task_runner_->BelongsToCurrentThread()); DCHECK_NE(state_, kUninitialized); |