Merge 32455 - Check for null frame pointers and do nothing to avoid a crash....

media/filters/ffmpeg_video_decoder.cc

Index: media/filters/ffmpeg_video_decoder.cc
===================================================================
--- media/filters/ffmpeg_video_decoder.cc	(revision 32473)
+++ media/filters/ffmpeg_video_decoder.cc	(working copy)
@@ -195,6 +195,15 @@
 bool FFmpegVideoDecoder::EnqueueVideoFrame(VideoSurface::Format surface_format,
                                            const TimeTuple& time,
                                            const AVFrame* frame) {
+  // TODO(fbarchard): Work around for FFmpeg http://crbug.com/27675
+  // The decoder is in a bad state and not decoding correctly.
+  // Checking for NULL avoids a crash in CopyPlane().
+  if (!frame->data[VideoSurface::kYPlane] ||
+      !frame->data[VideoSurface::kUPlane] ||
+      !frame->data[VideoSurface::kVPlane]) {
+    return true;
+  }
+
   scoped_refptr<VideoFrame> video_frame;
   VideoFrameImpl::CreateFrame(surface_format, width_, height_,
                               time.timestamp, time.duration, &video_frame);
Property changes on: media\filters\ffmpeg_video_decoder.cc
___________________________________________________________________
Deleted: svn:mergeinfo
   Reverse-merged /trunk/src/media/filters/ffmpeg_video_decoder.cc:r21611,23937,25416
   Reverse-merged /branches/chrome_webkit_merge_branch/media/filters/ffmpeg_video_decoder.cc:r69-2775