[FFmpeg-cvslog] Merge commit 'ea49f60523c4f4c43cb06a35166b44478d473e51'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jan 22 16:00:44 2014 +0100| [0e59e30b141ee10b0fd40159f643d39826df53ed] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0e59e30b141ee10b0fd40159f643d39826df53ed
---