Merge commit 'ea49f605'

* commit 'ea49f605':
  h264: skip chroma edges at the picture boundary while deblocking 4:4:4

Conflicts:
	libavcodec/h264.c

See: f27b22b4Merged-by: Michael Niedermayer <michaelni@gmx.at>