An encoding apparatus for encoding a rectangular video coding block including a short side and a long side, the encoding apparatus being configured to signal an extension directional intra-prediction mode within a set of directional intra-prediction modes using a signaling indicator, the set of directional intra-prediction modes comprising predetermined directional intra-prediction modes and the extension directional intra-prediction mode, wherein the predetermined directional intra-prediction modes are associated with intra-prediction directions within a directional range used for square blocks and the extension directional intra-prediction mode is associated with a prediction direction within a different and adjacent directional range, the encoding apparatus comprising: a mode mapping unit configured to select a predetermined directional intra-prediction mode from the set of directional intra-prediction modes in dependence of the extension directional intra-prediction mode, the selected predetermined directional intra-prediction mode being associated with an intra mode index, and to map the extension directional intra-prediction mode onto the selected predetermined directional intra-prediction mode; a signaling unit configured to generate the signaling indicator comprising at least the intra mode index and a flag value, the flag value indicating the mapping of the extension directional intra-prediction mode onto the selected predetermined directional intra-prediction mode, wherein the flag value is used when the intra mode index is associated with the extension directional intra-prediction mode, and to associate the signaling indicator with the extension directional intra-prediction mode; an intra-prediction unit configured to intra-predict pixel values of pixels of the rectangular video coding block on the basis of the extension directional intra-prediction mode associated with the signaling indicator for providing a predicted rectangular video coding block; and an encoding unit configured to encode the rectangular video coding block on the basis of the predicted rectangular video coding block. a mode mapping unit configured to select a predetermined directional intra-prediction mode from the set of directional intra-prediction modes in dependence of the extension directional intra-prediction mode, the selected predetermined directional intra-prediction mode being associated with an intra mode index, and to map the extension directional intra-prediction mode onto the selected predetermined directional intra-prediction mode; a signaling unit configured to generate the signaling indicator comprising at least the intra mode index and a flag value, the flag value indicating the mapping of the extension directional intra-prediction mode onto the selected predetermined directional intra-prediction mode, wherein the flag value is used when the intra mode index is associated with the extension directional intra-prediction mode, and to associate the signaling indicator with the extension directional intra-prediction mode; an intra-prediction unit configured to intra-predict pixel values of pixels of the rectangular video coding block on the basis of the extension directional intra-prediction mode associated with the signaling indicator for providing a predicted rectangular video coding block; and an encoding unit configured to encode the rectangular video coding block on the basis of the predicted rectangular video coding block.