Merge commit 'ea49f60523c4f4c43cb06a35166b44478d473e51'

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

Conflicts:
	libavcodec/h264.c

See: f27b22b4974c740f4c7b4140a793cac196179266
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-01-22 16:00:44 +01:00
commit 0e59e30b14

Diff Content Not Available