A method of decoding 360-degree video, including receiving video data indicative of a 360-degree video picture projected onto a 2D picture, the 2D picture being divided into a plurality of blocks, predicting a first of the blocks of the 2D picture, and deblock filtering pixels along a border of the first of the blocks based on the position of the border between the first of the blocks and a second of the blocks in the 360-degree video picture.