A method of decoding video data, including receiving a first block of video data encoded using an inter-prediction mode associating a first intra-prediction mode with the first block of video data, wherein the first intra-prediction mode is associated with a second block of video data, and determining a second intra-prediction mode for a neighbor block of video data based at least in part on the first intra-prediction mode.