A method of coding video data, the method comprising: determining, for a block within a picture of video data, a set of most probable intra-prediction modes for predicting the block of video data from available intra-prediction modes for predicting the block of video data, wherein the set of most probable intra-prediction modes has a size that is equal to a predetermined number that is greater than or equal to two, and wherein the size is fixed for all blocks in the picture; providing a codeword, wherein the codeword indicates whether the actual intra-prediction mode is one of the most probable intra-prediction modes, and if not provides an indication of the actual intra-prediction mode; and coding the block using the actual intra-prediction mode, wherein determining the set of most probable intra-prediction modes comprises: determining a first intra-prediction mode for a left-neighboring block of the block; determining a second intra-prediction mode for an above-neighboring block of the block; when the first intra-prediction mode is different than the second intra-prediction mode, including both the first intra-prediction mode and the second intra-prediction mode in the set of most probable intra-prediction modes; when the first intra-prediction mode is the same as the second intra-prediction mode, and when the first and second intra-prediction modes comprise a mode other than a planar mode, including the first intra-prediction mode and the planar mode in the set of most probable intra-prediction modes; and, when the first intra-prediction mode is the same as the second intra-prediction mode, and when the first and second intra-prediction modes comprise a planar mode, including the planar mode and a DC mode in the set of most probable intra-prediction modes. determining, for a block within a picture of video data, a set of most probable intra-prediction modes for predicting the block of video data from available intra-prediction modes for predicting the block of video data, wherein the set of most probable intra-prediction modes has a size that is equal to a predetermined number that is greater than or equal to two, and wherein the size is fixed for all blocks in the picture; providing a codeword, wherein the codeword indicates whether the actual intra-prediction mode is one of the most probable intra-prediction modes, and if not provides an indication of the actual intra-prediction mode; and coding the block using the actual intra-prediction mode, determining a first intra-prediction mode for a left-neighboring block of the block; determining a second intra-prediction mode for an above-neighboring block of the block; when the first intra-prediction mode is different than the second intra-prediction mode, including both the first intra-prediction mode and the second intra-prediction mode in the set of most probable intra-prediction modes; when the first intra-prediction mode is the same as the second intra-prediction mode, and when the first and second intra-prediction modes comprise a mode other than a planar mode, including the first intra-prediction mode and the planar mode in the set of most probable intra-prediction modes; and, when the first intra-prediction mode is the same as the second intra-prediction mode, and when the first and second intra-prediction modes comprise a planar mode, including the planar mode and a DC mode in the set of most probable intra-prediction modes.