Index: media/filters/ffmpeg_demuxer.h |
diff --git a/media/filters/ffmpeg_demuxer.h b/media/filters/ffmpeg_demuxer.h |
index efe40321727638af0c1fce58aecea35a5be6d5db..40cddda42a84ecd3fac83f3c15e7830f8b135afc 100644 |
--- a/media/filters/ffmpeg_demuxer.h |
+++ b/media/filters/ffmpeg_demuxer.h |
@@ -92,6 +92,7 @@ class FFmpegDemuxerStream : public DemuxerStream { |
virtual bool SupportsConfigChanges() OVERRIDE; |
virtual AudioDecoderConfig audio_decoder_config() OVERRIDE; |
virtual VideoDecoderConfig video_decoder_config() OVERRIDE; |
+ virtual VideoRotation video_rotation() OVERRIDE; |
// Returns the range of buffered data in this stream. |
Ranges<base::TimeDelta> GetBufferedRanges() const; |
@@ -133,6 +134,7 @@ class FFmpegDemuxerStream : public DemuxerStream { |
bool end_of_stream_; |
base::TimeDelta last_packet_timestamp_; |
Ranges<base::TimeDelta> buffered_ranges_; |
+ VideoRotation video_rotation_; |
DecoderBufferQueue buffer_queue_; |
ReadCB read_cb_; |
@@ -277,6 +279,8 @@ class MEDIA_EXPORT FFmpegDemuxer : public Demuxer { |
// time if the file doesn't have an association to Time. |
base::Time timeline_offset_; |
+ VideoRotation video_rotation_; |
wolenetz
2014/07/16 01:16:50
post-commit drive-by: Is this member unused?
scherkus (not reviewing)
2014/07/16 17:53:46
looks like it isn't!
suderman: can you send out a
|
+ |
// Liveness of the stream. |
Liveness liveness_; |