Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(634)

Unified Diff: media/filters/dummy_demuxer.h

Issue 8341033: Remove DemuxerStream::GetAVStream() once and for all. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: now with cmath Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/chunk_demuxer.cc ('k') | media/filters/dummy_demuxer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/dummy_demuxer.h
diff --git a/media/filters/dummy_demuxer.h b/media/filters/dummy_demuxer.h
index 1b74d010c9abbd0ecde1ff41ddafb3ffa60514d8..b029aa5b0387121811b444d4b181f69a649474c3 100644
--- a/media/filters/dummy_demuxer.h
+++ b/media/filters/dummy_demuxer.h
@@ -13,6 +13,7 @@
#include "media/base/audio_decoder_config.h"
#include "media/base/demuxer.h"
+#include "media/base/video_decoder_config.h"
namespace media {
@@ -24,6 +25,7 @@ class DummyDemuxerStream : public DemuxerStream {
virtual void Read(const ReadCallback& read_callback) OVERRIDE;
virtual Type type() OVERRIDE;
virtual const AudioDecoderConfig& audio_decoder_config() OVERRIDE;
+ virtual const VideoDecoderConfig& video_decoder_config() OVERRIDE;
virtual void EnableBitstreamConverter() OVERRIDE;
private:
@@ -31,6 +33,7 @@ class DummyDemuxerStream : public DemuxerStream {
Type type_;
AudioDecoderConfig audio_config_;
+ VideoDecoderConfig video_config_;
DISALLOW_COPY_AND_ASSIGN(DummyDemuxerStream);
};
« no previous file with comments | « media/filters/chunk_demuxer.cc ('k') | media/filters/dummy_demuxer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698