1. A method of decoding video data, the method comprising: determining a first most probable intra-prediction mode and a second most probable intra-prediction mode for a coded block of video data based on a context for the current block; receiving an entropy encoded codeword corresponding to a modified intra-prediction mode index; determining an intra-prediction mode index based on the modified intra-prediction mode index, an intra-prediction mode index for the first most probable intra-prediction mode, and an intra-prediction mode index for the second most probable intra-prediction mode; selecting an intra-prediction mode other than the first most probable intra-prediction mode and second most probable intra-prediction mode to use to decode the coded block, wherein the selected intra-prediction mode corresponds to the determined intra-prediction mode index, wherein each of the intra-prediction modes corresponds to a respective intra-prediction mode index, and when the modified intra-prediction mode index plus one is greater than or equal to the intra-prediction mode index for the first most probable intra-prediction mode and greater than or equal to the intra-prediction mode index for the second most probable intra-prediction mode, selecting the intra-prediction mode comprises selecting the intra-prediction mode corresponding to an intra-prediction mode index that is two greater than the modified intra-prediction mode index, when the modified intra-prediction mode index is less than the intra-prediction mode index for the first most probable intra-prediction mode and less than the intra-prediction mode index for the second most probable intra-prediction mode, selecting the intra-prediction mode comprises selecting the intra-prediction mode having an intra-prediction mode index equal to the modified intra-prediction mode index, and when the modified intra-prediction mode index plus one is greater than or equal to the intra-prediction mode index for the first most probable intra-prediction mode and less than the intra-prediction mode index for the second most probable intra-prediction mode, selecting the intra-prediction mode comprises selecting the intra-prediction mode corresponding to an intra-prediction mode index that is one greater than the modified intra-prediction mode index; and decoding the current block using the selected intra-prediction mode.