Use av_rescale_q() for converting FFmpeg timestamps to base::TimeDelta (second attempt).

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 9e92cd471ed2542af39012c03b4c16315fecdc73..bd785b7c152cf6792adf77f758c12799fe80558f 100644
--- a/media/filters/ffmpeg_demuxer.h
+++ b/media/filters/ffmpeg_demuxer.h
@@ -70,9 +70,7 @@ class FFmpegDemuxerStream : public DemuxerStream {
   virtual const MediaFormat& media_format();
   virtual void Read(Callback1<Buffer*>::Type* read_callback);
 
-  AVStream* av_stream() {
-    return av_stream_;
-  }
+  AVStream* av_stream() const { return stream_; }
 
   static const char* interface_id();
 
@@ -83,10 +81,12 @@ class FFmpegDemuxerStream : public DemuxerStream {
   // Returns true if there are still pending reads.
   bool FulfillPendingReads();
 
+  // Converts an FFmpeg stream timestamp into a base::TimeDelta.
+  base::TimeDelta ConvertTimestamp(int64 timestamp);
+
   FFmpegDemuxer* demuxer_;
-  AVStream* av_stream_;
+  AVStream* stream_;
   MediaFormat media_format_;
-  base::TimeDelta time_base_;
   base::TimeDelta duration_;
   bool discontinuous_;