Merge 21611 - Implemented proper pausethenseek behaviour for the media pipeli...

media/filters/ffmpeg_demuxer.cc

Index: media/filters/ffmpeg_demuxer.cc
===================================================================
--- media/filters/ffmpeg_demuxer.cc	(revision 21798)
+++ media/filters/ffmpeg_demuxer.cc	(working copy)
@@ -139,6 +139,7 @@
 
 void FFmpegDemuxerStream::FlushBuffers() {
   DCHECK_EQ(MessageLoop::current(), demuxer_->message_loop());
+  DCHECK(read_queue_.empty()) << "Read requests should be empty";
   buffer_queue_.clear();
   discontinuous_ = true;
 }
@@ -430,8 +431,10 @@
     flags |= AVSEEK_FLAG_BACKWARD;
   }
 
-  if (av_seek_frame(format_context_, -1, time.InMicroseconds(),
-                    flags) < 0) {
+  // Passing -1 as our stream index lets FFmpeg pick a default stream.  FFmpeg
+  // will attempt to use the lowest-index video stream, if present, followed by
+  // the lowest-index audio stream.
+  if (av_seek_frame(format_context_, -1, time.InMicroseconds(), flags) < 0) {
     // TODO(scherkus): signal error.
     NOTIMPLEMENTED();
   }
Property changes on: media\filters\ffmpeg_demuxer.cc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/media/filters/ffmpeg_demuxer.cc:r21611