Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / media / filters / ffmpeg_audio_decoder.cc

diff --git a/src/media/filters/ffmpeg_audio_decoder.cc b/src/media/filters/ffmpeg_audio_decoder.cc
index b45b940..ae4f3fb 100644 (file)
--- a/src/media/filters/ffmpeg_audio_decoder.cc
+++ b/src/media/filters/ffmpeg_audio_decoder.cc
@@ -143,6 +143,10 @@ FFmpegAudioDecoder::~FFmpegAudioDecoder() {
   }
 }
 
+std::string FFmpegAudioDecoder::GetDisplayName() const {
+  return "FFmpegAudioDecoder";
+}
+
 void FFmpegAudioDecoder::Initialize(const AudioDecoderConfig& config,
                                     const PipelineStatusCB& status_cb,
                                     const OutputCB& output_cb) {
@@ -202,7 +206,7 @@ void FFmpegAudioDecoder::DecodeBuffer(
   DCHECK_NE(state_, kUninitialized);
   DCHECK_NE(state_, kDecodeFinished);
   DCHECK_NE(state_, kError);
-  DCHECK(buffer);
+  DCHECK(buffer.get());
 
   // Make sure we are notified if http://crbug.com/49709 returns.  Issue also
   // occurs with some damaged files.