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; selecting a table of codewords based on the context for the current block, wherein the table of codewords comprises a plurality of variable length codewords corresponding to modified intra-prediction mode indexes that correspond to intra-prediction modes other than the first most probable intra-prediction mode and the second most probable intra-prediction mode; determining one of the modified intra-prediction mode indexes that corresponds to a received codeword using the table of codewords; 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 one of the modified intra-prediction mode indexes; and decoding the current block using the selected intra-prediction mode.