Decoding of a merge-predicted block is carried out, for triangular partitions of the block, using a combination of inter-prediction and intra-prediction. The combination of inter-prediction and intra-prediction to be used is signalled on a received bitstream. Combination may be algorithmic, for example arithmetic.