A method of encoding video data, the method comprising: determining, for a block within a video data image, a set of more likely intra-prediction modes to predict the block of video data from the modes of intra-prediction available to predict the block of video data, in which the set of most likely intra-prediction modes has a size that is equal to a predetermined number that is greater than or equal to two, and in which the size is fixed for all the blocks in the image; provide a code word, in which the code word indicates whether the actual intra-prediction mode is one of the most likely intra-prediction modes, and if it does not provide an indication of the actual intra-prediction mode; and encoding the block using the actual intra-prediction mode, in which the determination of the most likely set of intra-prediction modes comprises: determining a first intra-prediction mode for a left contiguous block of the block; determine a second intra-prediction mode for an upper contiguous block of the block; when the first intra-prediction mode is different from the second intra-prediction mode, include both the first intra-prediction mode and the second intra-prediction mode in the set of more likely 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 different mode than a planar mode, include the first intra-prediction mode and the planar mode in the set of more likely 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, include the planar mode and a DC mode in the set of more likely intra-prediction modes.