Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1187)

Unified Diff: media/video/ffmpeg_video_decode_engine.cc

Issue 6262002: Chromium build failed with heap leak checker, or configured with (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/net/gaia/gaia_auth_fetcher.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/video/ffmpeg_video_decode_engine.cc
diff --git a/media/video/ffmpeg_video_decode_engine.cc b/media/video/ffmpeg_video_decode_engine.cc
index 70b21a1d4209e2c91068544c8efb7a0c8cf9a877..3b29906800b2cee023a17a6e86057498aeb51182 100644
--- a/media/video/ffmpeg_video_decode_engine.cc
+++ b/media/video/ffmpeg_video_decode_engine.cc
@@ -359,15 +359,14 @@ VideoFrame::Format FFmpegVideoDecodeEngine::GetSurfaceFormat() const {
case PIX_FMT_YUV420P:
case PIX_FMT_YUVJ420P:
return VideoFrame::YV12;
- break;
case PIX_FMT_YUV422P:
case PIX_FMT_YUVJ422P:
return VideoFrame::YV16;
- break;
default:
// TODO(scherkus): More formats here?
- return VideoFrame::INVALID;
+ break;
}
+ return VideoFrame::INVALID;
}
} // namespace media
« no previous file with comments | « chrome/common/net/gaia/gaia_auth_fetcher.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698