Merge from Chromium at DEPS revision 278856

This commit was generated by merge_to_master.py.

Change-Id: If3807744d3e5d3ee84b897bd2d099a2b7ed2e7a3

1 files changed, 3 insertions, 3 deletions

diff --git a/media/filters/vpx_video_decoder.cc b/media/filters/vpx_video_decoder.cc
index 5cec72913b..20416f1480 100644
--- a/media/filters/vpx_video_decoder.cc
+++ b/media/filters/vpx_video_decoder.cc
@@ -259,8 +259,9 @@ static vpx_codec_ctx* InitializeVpxContext(vpx_codec_ctx* context,
 bool VpxVideoDecoder::ConfigureDecoder(const VideoDecoderConfig& config) {
   if (config.codec() != kCodecVP8 && config.codec() != kCodecVP9)
     return false;
-  // Only VP8 videos with alpha are handled by VpxVideoDecoder.  Everything else
-  // goes to FFmpegVideoDecoder.
+
+  // In VP8 videos, only those with alpha are handled by VpxVideoDecoder. All
+  // other VP8 videos go to FFmpegVideoDecoder.
   if (config.codec() == kCodecVP8 && config.format() != VideoFrame::YV12A)
     return false;
 
@@ -354,7 +355,6 @@ void VpxVideoDecoder::DecodeBuffer(const scoped_refptr<DecoderBuffer>& buffer) {
   // Transition to kDecodeFinished on the first end of stream buffer.
   if (state_ == kNormal && buffer->end_of_stream()) {
     state_ = kDecodeFinished;
-    output_cb_.Run(VideoFrame::CreateEOSFrame());
     base::ResetAndReturn(&decode_cb_).Run(kOk);
     return;
   }