An object of the embodiments is to achieve an improved reference picture handling. That is achieved by taking into account whether the reference pictures in the decoded picture buffer are long-term reference pictures or short-term reference pictures when determining how they should be marked when the information of the reference picture set is received. The reference pictures are marked as “used for short-term reference” or “used for long-term reference” in the Decoded Picture Buffer (DPB) depending on whether they are included as short-term pictures or long-term pictures in the RPS of a current picture.