A method for coding video data, the method comprising: for a current video block, determining a first most probable intra prediction mode and a second most probable intra prediction mode; based on the first most probable intra prediction mode and the second most probable intra prediction mode, determining an estimate of an actual intra prediction mode used to code the current video block, wherein determining the estimate of the actual intra prediction mode comprises: in response to the first most probable mode being an angular intra prediction mode and the second most probable mode being a non-angular intra prediction mode, selecting the first most probable mode as the estimate of the actual intra prediction mode; in response to both the first most probable mode and the second most probable mode being different angular prediction modes, selecting one of the first most probable mode and the second most probable mode as the estimate of the actual intra prediction, wherein selecting one of the first most probable mode and the second most probable mode as the estimate of the actual intra prediction mode comprises selecting as the estimate of the actual intra prediction mode one of which of the first most probable mode and the second most probable mode has a smaller intra mode number and which of the first most probable mode and the second most probable mode is associated with a block of video data that is closer in size to the current video block. for a current video block, determining a first most probable intra prediction mode and a second most probable intra prediction mode; based on the first most probable intra prediction mode and the second most probable intra prediction mode, determining an estimate of an actual intra prediction mode used to code the current video block, wherein determining the estimate of the actual intra prediction mode comprises: in response to the first most probable mode being an angular intra prediction mode and the second most probable mode being a non-angular intra prediction mode, selecting the first most probable mode as the estimate of the actual intra prediction mode; in response to both the first most probable mode and the second most probable mode being different angular prediction modes, selecting one of the first most probable mode and the second most probable mode as the estimate of the actual intra prediction, wherein selecting one of the first most probable mode and the second most probable mode as the estimate of the actual intra prediction mode comprises selecting as the estimate of the actual intra prediction mode one of which of the first most probable mode and the second most probable mode has a smaller intra mode number and which of the first most probable mode and the second most probable mode is associated with a block of video data that is closer in size to the current video block. in response to the first most probable mode being an angular intra prediction mode and the second most probable mode being a non-angular intra prediction mode, selecting the first most probable mode as the estimate of the actual intra prediction mode; in response to both the first most probable mode and the second most probable mode being different angular prediction modes, selecting one of the first most probable mode and the second most probable mode as the estimate of the actual intra prediction, wherein selecting one of the first most probable mode and the second most probable mode as the estimate of the actual intra prediction mode comprises selecting as the estimate of the actual intra prediction mode one of which of the first most probable mode and the second most probable mode has a smaller intra mode number and which of the first most probable mode and the second most probable mode is associated with a block of video data that is closer in size to the current video block.