Commit 173f5ad0 authored by Philipp Merkle's avatar Philipp Merkle
Browse files

rebase

parent 65b671d9
......@@ -50,7 +50,6 @@
#include <assert.h>
#include <cassert>
#define JVET_N0217_MATRIX_INTRAPRED 1 // matrix-based intra prediction (MIP)
#define JVET_N0400_SIGNAL_TRIANGLE_CAND_NUM 1 // JVET-N0400, JVET-N0447, JVET-N0500, JVET-N0851, align triangle merge candidate number and regular merge candidate number
......
Supports Markdown
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