diff -up chromium-54.0.2840.100/media/ffmpeg/ffmpeg_common.cc.ffmpeg-2.4 chromium-54.0.2840.100/media/ffmpeg/ffmpeg_common.cc --- chromium-54.0.2840.100/media/ffmpeg/ffmpeg_common.cc.ffmpeg-2.4 2016-11-14 07:18:25.390000000 +0100 +++ chromium-54.0.2840.100/media/ffmpeg/ffmpeg_common.cc 2016-11-14 19:21:31.860000000 +0100 @@ -782,7 +782,6 @@ int32_t HashCodecName(const char* codec_ static_cast<int>(gfx::ColorSpace::MatrixID::C) == AVCOL_SPC_##C, \ "gfx::ColorSpace::MatrixID::" #C " does not match AVCOL_SPC_" #C); -TEST_PRIMARY(RESERVED0); TEST_PRIMARY(BT709); TEST_PRIMARY(UNSPECIFIED); TEST_PRIMARY(RESERVED); @@ -793,7 +792,6 @@ TEST_PRIMARY(SMPTE240M); TEST_PRIMARY(FILM); TEST_PRIMARY(BT2020); -TEST_TRANSFER(RESERVED0); TEST_TRANSFER(BT709); TEST_TRANSFER(UNSPECIFIED); TEST_TRANSFER(RESERVED);