A method of encoding video data, the method comprising: determining, for a luminance block of the video data, a set of most probable 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, determining, for a chrominance block corresponding to the luminance block, a set of intra-prediction modes comprising horizontal mode, vertical mode, planar mode, DC mode, and luma signal prediction mode, wherein when an actual intra-prediction mode for the luminance block comprises a mode other than horizontal mode, vertical mode, planar mode, and DC mode, the set of intra-prediction modes further comprises a reuse of the actual intra-prediction mode for the luminance block, and wherein when the actual intra-prediction mode for the luminance block comprises one of horizontal mode, vertical mode, planar mode, and DC mode, the set of intra-prediction modes further comprises a mode other than horizontal mode, vertical mode, planar mode, and DC mode; encoding a value representative of the actual intra-prediction mode for the luminance block based at least in part on the set of most probable intra-prediction modes; determine a mapping of a set of values to the set of intra-prediction modes; encoding a value representative of an actual intra-prediction mode for the chrominance block based on the mapping of the set of values to the set of intra-prediction modes; encoding the chrominance block using the actual intra-prediction mode for the chrominance block; and encoding the luminance block using the actual intra-prediction mode for the luminance block. determining, for a luminance block of the video data, a set of most probable 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, determining, for a chrominance block corresponding to the luminance block, a set of intra-prediction modes comprising horizontal mode, vertical mode, planar mode, DC mode, and luma signal prediction mode, wherein when an actual intra-prediction mode for the luminance block comprises a mode other than horizontal mode, vertical mode, planar mode, and DC mode, the set of intra-prediction modes further comprises a reuse of the actual intra-prediction mode for the luminance block, and wherein when the actual intra-prediction mode for the luminance block comprises one of horizontal mode, vertical mode, planar mode, and DC mode, the set of intra-prediction modes further comprises a mode other than horizontal mode, vertical mode, planar mode, and DC mode; encoding a value representative of the actual intra-prediction mode for the luminance block based at least in part on the set of most probable intra-prediction modes; determine a mapping of a set of values to the set of intra-prediction modes; encoding a value representative of an actual intra-prediction mode for the chrominance block based on the mapping of the set of values to the set of intra-prediction modes; encoding the chrominance block using the actual intra-prediction mode for the chrominance block; and encoding the luminance block using the actual intra-prediction mode for the luminance block. <EOS>