diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-13 00:41:22 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-13 00:41:22 +0000 |
| commit | e6565a4fe0e96ed2dc722fc232b1e3b9129fbb77 (patch) | |
| tree | 7f04a35dee0b4bf37ee3efb86e48bec5513e411a /media | |
| parent | e73e0fe57fdc98d7d963c9aaf243e0b24afe67c3 (diff) | |
| download | chromium_src-e6565a4fe0e96ed2dc722fc232b1e3b9129fbb77.zip chromium_src-e6565a4fe0e96ed2dc722fc232b1e3b9129fbb77.tar.gz chromium_src-e6565a4fe0e96ed2dc722fc232b1e3b9129fbb77.tar.bz2 | |
Chromium build failed with heap leak checker, or configured with
'gyp_chromium -Dlinux_use_heapchecker=1 -Dlinux_keep_shadow_stacks=1'
parameters. This configuration set gcc option '-finstrument-functions'
and cause 'control reaches end of non-void function' error in some
sources. Some errors occur in WebKit, and this changelist doesn't
include patches for WebKit sources.
TEST=pass sync_unit_tests, browser_tests, net_unittests
Original patch by Takashi Toyoshima <toyoshim@google.com> at
http://codereview.chromium.org/5991005/
Review URL: http://codereview.chromium.org/6262002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71274 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/video/ffmpeg_video_decode_engine.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/media/video/ffmpeg_video_decode_engine.cc b/media/video/ffmpeg_video_decode_engine.cc index 70b21a1..3b299068 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 |