A method of decoding a block of video data, the method comprising: deriving, from among a plurality of intra prediction modes, M most probable modes (MPMs) for intra prediction of the block of video data, wherein M is greater than 3; decoding a syntax element that indicates whether a MPM index or a non-MPM index is used to indicate a selected intra prediction mode of the plurality of intra prediction modes for intra prediction of the block of video data, wherein the MPM index indicates which of the M MPMs is the selected intra prediction mode, and wherein the non-MPM index indicates which of the plurality of intra prediction modes other than the M MPMs is the selected intra prediction mode; based on said syntax element indicating that the MPM index is used to indicate the selected intra prediction mode, selecting, for each of one or more context-modeled bins of the MPM index, based on intra prediction modes used to decode one or more neighboring blocks, a context index for the context-modeled bin, wherein selecting a context index for a context-modeled bin comprises: selecting a first context index if intra prediction modes used to decode a left neighboring block and an above neighboring block are the same and neither of the intra prediction modes used to decode the left neighboring block nor the above neighboring block is DC or planar; selecting a second context index if intra prediction modes used to decode the left neighboring block and the above neighboring block are same and at least one of the intra prediction modes used to decode the left neighboring block and the above neighboring block is DC or planar; selecting a third context index if intra prediction modes used to decode the left neighboring block and the above neighboring block are different and neither of the intra prediction modes used to decode the left neighboring block nor the above neighboring block is planar; and selecting a fourth context index if intra prediction modes used to decode the left neighboring block and the above neighboring block are different and at least one of the intra prediction modes used to decode the left neighboring block and the above neighboring block is planar; and reconstructing the block of video data based on the selected intra prediction mode. deriving, from among a plurality of intra prediction modes, M most probable modes (MPMs) for intra prediction of the block of video data, wherein M is greater than 3; decoding a syntax element that indicates whether a MPM index or a non-MPM index is used to indicate a selected intra prediction mode of the plurality of intra prediction modes for intra prediction of the block of video data, wherein the MPM index indicates which of the M MPMs is the selected intra prediction mode, and wherein the non-MPM index indicates which of the plurality of intra prediction modes other than the M MPMs is the selected intra prediction mode; based on said syntax element indicating that the MPM index is used to indicate the selected intra prediction mode, selecting, for each of one or more context-modeled bins of the MPM index, based on intra prediction modes used to decode one or more neighboring blocks, a context index for the context-modeled bin, wherein selecting a context index for a context-modeled bin comprises: selecting a first context index if intra prediction modes used to decode a left neighboring block and an above neighboring block are the same and neither of the intra prediction modes used to decode the left neighboring block nor the above neighboring block is DC or planar; selecting a second context index if intra prediction modes used to decode the left neighboring block and the above neighboring block are same and at least one of the intra prediction modes used to decode the left neighboring block and the above neighboring block is DC or planar; selecting a third context index if intra prediction modes used to decode the left neighboring block and the above neighboring block are different and neither of the intra prediction modes used to decode the left neighboring block nor the above neighboring block is planar; and selecting a fourth context index if intra prediction modes used to decode the left neighboring block and the above neighboring block are different and at least one of the intra prediction modes used to decode the left neighboring block and the above neighboring block is planar; and selecting a first context index if intra prediction modes used to decode a left neighboring block and an above neighboring block are the same and neither of the intra prediction modes used to decode the left neighboring block nor the above neighboring block is DC or planar; selecting a second context index if intra prediction modes used to decode the left neighboring block and the above neighboring block are same and at least one of the intra prediction modes used to decode the left neighboring block and the above neighboring block is DC or planar; selecting a third context index if intra prediction modes used to decode the left neighboring block and the above neighboring block are different and neither of the intra prediction modes used to decode the left neighboring block nor the above neighboring block is planar; and selecting a fourth context index if intra prediction modes used to decode the left neighboring block and the above neighboring block are different and at least one of the intra prediction modes used to decode the left neighboring block and the above neighboring block is planar; and reconstructing the block of video data based on the selected intra prediction mode.