--- a/content/media/fmp4/ffmpeg/FFmpegH264Decoder.cpp
+++ b/content/media/fmp4/ffmpeg/FFmpegH264Decoder.cpp
@@ -66,42 +66,40 @@ FFmpegH264Decoder::DecodeFrame(mp4_demux
     avcodec_decode_video2(&mCodecContext, frame, &decoded, &packet);
 
   if (bytesConsumed < 0) {
     NS_WARNING("FFmpeg video decoder error.");
     mCallback->Error();
     return;
   }
 
-  if (!decoded) {
-    // The decoder doesn't have enough data to decode a frame yet.
-    return;
-  }
+  // If we've decoded a frame then we need to output it
+  if (decoded) {
+    nsAutoPtr<VideoData> data;
 
-  nsAutoPtr<VideoData> data;
-
-  VideoInfo info;
-  info.mDisplay = nsIntSize(mCodecContext.width, mCodecContext.height);
-  info.mStereoMode = StereoMode::MONO;
-  info.mHasVideo = true;
+    VideoInfo info;
+    info.mDisplay = nsIntSize(mCodecContext.width, mCodecContext.height);
+    info.mStereoMode = StereoMode::MONO;
+    info.mHasVideo = true;
 
-  data = VideoData::CreateFromImage(
-    info, mImageContainer, aSample->byte_offset, aSample->composition_timestamp,
-    aSample->duration, mCurrentImage, aSample->is_sync_point, -1,
-    gfx::IntRect(0, 0, mCodecContext.width, mCodecContext.height));
+    data = VideoData::CreateFromImage(
+      info, mImageContainer, aSample->byte_offset, aSample->composition_timestamp,
+      aSample->duration, mCurrentImage, aSample->is_sync_point, -1,
+      gfx::IntRect(0, 0, mCodecContext.width, mCodecContext.height));
+
+    // Insert the frame into the heap for reordering.
+    mDelayedFrames.Push(data.forget());
 
-  // Insert the frame into the heap for reordering.
-  mDelayedFrames.Push(data.forget());
-
-  // Reorder video frames from decode order to presentation order. The minimum
-  // size of the heap comes from one P frame + |max_b_frames| B frames, which
-  // is the maximum number of frames in a row which will be out-of-order.
-  if (mDelayedFrames.Length() > (uint32_t)mCodecContext.max_b_frames + 1) {
-    VideoData* d = mDelayedFrames.Pop();
-    mCallback->Output(d);
+    // Reorder video frames from decode order to presentation order. The minimum
+    // size of the heap comes from one P frame + |max_b_frames| B frames, which
+    // is the maximum number of frames in a row which will be out-of-order.
+    if (mDelayedFrames.Length() > (uint32_t)mCodecContext.max_b_frames + 1) {
+      VideoData* d = mDelayedFrames.Pop();
+      mCallback->Output(d);
+    }
   }
 
   if (mTaskQueue->IsEmpty()) {
     mCallback->InputExhausted();
   }
 }
 
 static void