diff options
| author | andresantoso <andresantoso@chromium.org> | 2015-08-14 14:45:57 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-14 21:46:33 +0000 |
| commit | f4d599cc75917ab19a3418d10998a73de8df65af (patch) | |
| tree | 52d5893e1c7467047f815ca44e7f6255f63e1d06 /cc | |
| parent | 247f10bb73ec99d4de0d42a39c407a5309dbd853 (diff) | |
| download | chromium_src-f4d599cc75917ab19a3418d10998a73de8df65af.zip chromium_src-f4d599cc75917ab19a3418d10998a73de8df65af.tar.gz chromium_src-f4d599cc75917ab19a3418d10998a73de8df65af.tar.bz2 | |
Remove #if around PIXEL_FORMAT_NV12
PIXEL_FORMAT_NV12 is only supported on Mac and ChromeOS, but we can still allow
it to be part of the enum.
BUG=510260
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1288003004
Cr-Commit-Position: refs/heads/master@{#343503}
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/resources/video_resource_updater.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/cc/resources/video_resource_updater.cc b/cc/resources/video_resource_updater.cc index e5a6c5f..9650777 100644 --- a/cc/resources/video_resource_updater.cc +++ b/cc/resources/video_resource_updater.cc @@ -405,9 +405,7 @@ VideoFrameExternalResources VideoResourceUpdater::CreateForHardwarePlanes( case media::PIXEL_FORMAT_I420: external_resources.type = VideoFrameExternalResources::YUV_RESOURCE; break; -#if defined(OS_MACOSX) || defined(OS_CHROMEOS) case media::PIXEL_FORMAT_NV12: -#endif case media::PIXEL_FORMAT_YV12: case media::PIXEL_FORMAT_YV16: case media::PIXEL_FORMAT_YV24: |