Commit 8f3692b7 authored by Tom Finegan's avatar Tom Finegan

Allow ncobmc experiments with warped_motion.

CMake build updates:

- The conflict with warped_motion has been resolved.
- This also resolves a configure build mismatch with
  ncobmc_adapt_weight: warped_motion forcing it to off
  caused the mismatch.

BUG=aomedia:856

Change-Id: Ida2f68676c8a25a63c631dbfe101041409dcafe6
parent 2fd51837
......@@ -235,15 +235,6 @@ if (CONFIG_STRIPED_LOOP_RESTORATION)
endif()
endif()
if (CONFIG_WARPED_MOTION)
if (CONFIG_NCOBMC)
change_config_and_warn(CONFIG_NCOBMC 0 CONFIG_WARPED_MOTION)
endif ()
if (CONFIG_NCOBMC_ADAPT_WEIGHT)
change_config_and_warn(CONFIG_NCOBMC_ADAPT_WEIGHT 0 CONFIG_WARPED_MOTION)
endif ()
endif ()
if (CONFIG_MFMV)
if (NOT CONFIG_FRAME_MARKER)
change_config_and_warn(CONFIG_FRAME_MARKER 1 CONFIG_MFMV)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment