Merge commit 'ea49f60523c4f4c43cb06a35166b44478d473e51'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 22 Jan 2014 15:00:44 +0000 (16:00 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 22 Jan 2014 15:02:12 +0000 (16:02 +0100)
* 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>

Trivial merge