Update to Pipeline Metadata and Decoder Stream for Orientation Data

media/filters/ffmpeg_demuxer.h

Index: media/filters/ffmpeg_demuxer.h
diff --git a/media/filters/ffmpeg_demuxer.h b/media/filters/ffmpeg_demuxer.h
index efe40321727638af0c1fce58aecea35a5be6d5db..8f67f4e947992010ca7a1802f5f33e2471f56e65 100644
--- a/media/filters/ffmpeg_demuxer.h
+++ b/media/filters/ffmpeg_demuxer.h
@@ -92,6 +92,8 @@ 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;
+  virtual void set_video_rotation(VideoRotation) OVERRIDE;
 
   // Returns the range of buffered data in this stream.
   Ranges<base::TimeDelta> GetBufferedRanges() const;
@@ -133,6 +135,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 +280,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_;
+
   // Liveness of the stream.
   Liveness liveness_;