Blocks of a video data stream may be encoded using either intra-frame (intra) prediction or inter-frame (inter) prediction. Combining intra and inter prediction can provide greater compression while maintaining the quality of the decoded video stream. Intra and inter prediction blocks are combined by weighting each block on a pixel-by-pixel basis and adding the weighted pixel values together. Weighting is based on the intra prediction mode. Pixels are weighted to give emphasis to intra predicted pixels closer to the boundaries where the predicted pixels originate and more emphasis to inter predicted pixels further away from the boundaries.