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 /media/mojo | |
| 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 'media/mojo')
| -rw-r--r-- | media/mojo/services/media_type_converters.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/media/mojo/services/media_type_converters.cc b/media/mojo/services/media_type_converters.cc index c071351..add6f3e 100644 --- a/media/mojo/services/media_type_converters.cc +++ b/media/mojo/services/media_type_converters.cc @@ -137,9 +137,7 @@ ASSERT_ENUM_EQ_RAW(VideoPixelFormat, PIXEL_FORMAT_I420, VIDEO_FORMAT_I420); ASSERT_ENUM_EQ_RAW(VideoPixelFormat, PIXEL_FORMAT_YV16, VIDEO_FORMAT_YV16); ASSERT_ENUM_EQ_RAW(VideoPixelFormat, PIXEL_FORMAT_YV12A, VIDEO_FORMAT_YV12A); ASSERT_ENUM_EQ_RAW(VideoPixelFormat, PIXEL_FORMAT_YV24, VIDEO_FORMAT_YV24); -#if defined(OS_MACOSX) ASSERT_ENUM_EQ_RAW(VideoPixelFormat, PIXEL_FORMAT_NV12, VIDEO_FORMAT_NV12); -#endif ASSERT_ENUM_EQ_RAW(VideoPixelFormat, PIXEL_FORMAT_ARGB, VIDEO_FORMAT_ARGB); ASSERT_ENUM_EQ_RAW(VideoPixelFormat, PIXEL_FORMAT_XRGB, VIDEO_FORMAT_XRGB); ASSERT_ENUM_EQ_RAW(VideoPixelFormat, PIXEL_FORMAT_MAX, VIDEO_FORMAT_FORMAT_MAX); |