A method of coding video data, the method comprising: determining (354; 380) whether an above-neighboring block above a current block is intra-predicted; determining (354; 380) whether a left-neighboring block to the left of the current block is intra-predicted; determining (356; 382) a first weight value to be applied to intra-prediction samples of an intra-prediction block for the current block according to whether the above-neighboring block is intra-predicted and whether the left-neighboring block is intra-predicted; determining (356; 382) a second weight value to be applied to inter-prediction samples of an inter-prediction block for the current block according to whether the above-neighboring block is intra-predicted and whether the left-neighboring block is intra-predicted; generating (358; 384) a prediction block for the current block as a weighted combination of the intra-prediction block to which the first weight value is applied and the inter-prediction block to which the second weight value is applied; and coding the current block using the prediction block; wherein the above-neighboring block is a block above the current block that touches an upper-right corner of the current block, and wherein the left-neighboring block is a block to the left of the current block that touches a lower-left corner of the current block; and wherein: when both, the above-neighboring block and the left-neighboring block are intra-predicted, determining the first weight value and the second weight value comprises determining the first weight value to be greater than the second weight value; when only one of the above-neighboring block and the left-neighboring block is intra-predicted, determining the first weight value and the second weight value comprises determining the first weight value to be equal to the second weight value; and otherwise, determining the first weight value and the second weight value comprises determining the first weight value to be less than the second weight value. determining (354; 380) whether an above-neighboring block above a current block is intra-predicted; determining (354; 380) whether a left-neighboring block to the left of the current block is intra-predicted; determining (356; 382) a first weight value to be applied to intra-prediction samples of an intra-prediction block for the current block according to whether the above-neighboring block is intra-predicted and whether the left-neighboring block is intra-predicted; determining (356; 382) a second weight value to be applied to inter-prediction samples of an inter-prediction block for the current block according to whether the above-neighboring block is intra-predicted and whether the left-neighboring block is intra-predicted; generating (358; 384) a prediction block for the current block as a weighted combination of the intra-prediction block to which the first weight value is applied and the inter-prediction block to which the second weight value is applied; and coding the current block using the prediction block; wherein the above-neighboring block is a block above the current block that touches an upper-right corner of the current block, and wherein the left-neighboring block is a block to the left of the current block that touches a lower-left corner of the current block; and wherein: when both, the above-neighboring block and the left-neighboring block are intra-predicted, determining the first weight value and the second weight value comprises determining the first weight value to be greater than the second weight value; when only one of the above-neighboring block and the left-neighboring block is intra-predicted, determining the first weight value and the second weight value comprises determining the first weight value to be equal to the second weight value; and otherwise, determining the first weight value and the second weight value comprises determining the first weight value to be less than the second weight value. when both, the above-neighboring block and the left-neighboring block are intra-predicted, determining the first weight value and the second weight value comprises determining the first weight value to be greater than the second weight value; when only one of the above-neighboring block and the left-neighboring block is intra-predicted, determining the first weight value and the second weight value comprises determining the first weight value to be equal to the second weight value; and otherwise, determining the first weight value and the second weight value comprises determining the first weight value to be less than the second weight value.