Combining intra-frame and inter-frame prediction is described. A first combined prediction block for a first block is formed by combining weighted pixel values of a first inter prediction block and a first intra prediction block. The weighting is based on the intra prediction mode. A second combined prediction block is formed by selecting a second intra prediction block using a first partitioned area of the first block, selecting a second inter prediction block using a second partitioned area of the second block, the first and second partitioned areas separated by a border at an angle to an orientation of a row or column of pixels, and combining pixel values of the second inter and intra prediction blocks that are weighted by a weighting function based on a distance of a pixel from the border. One of the combined prediction blocks is selected to encode the first block.