A method of decoding encoded video data for providing a residual video coding block is provided. An intra-prediction mode identifier is extracted from the encoded video data. The method includes: generating a predicted video coding block based on a selected intra-prediction mode; pre-selecting a plane-based intra-prediction mode and a further intra-prediction mode, when the extracted intra-prediction mode identifier is equal to a first predefined intra-prediction mode identifier; selecting the plane-based intra-prediction mode or the further intra-prediction mode, based on (a) an additional flag extracted from the encoded video data or (b) a deviation measure; restoring a video coding block based on the residual video coding block and the predicted video coding block. The deviation measure quantifies deviations of a plurality of reference samples from neighboring video coding blocks from a plurality of fitting samples defined by a fitting plane based on the plurality of reference samples.