[FFmpeg-cvslog] Merge commit '23e85be58fc64b2e804e68b0034a08a6d257e523'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 21 13:06:14 2013 +0100| [86d9d349cce54984ef7f4b67647ae73bf1c48f88] | committer: Michael Niedermayer

Merge commit '23e85be58fc64b2e804e68b0034a08a6d257e523'

* commit '23e85be58fc64b2e804e68b0034a08a6d257e523':
  h264: add a parameter to the CHROMA444 macro.
  h264: add a parameter to the CHROMA422 macro.

Conflicts:
	libavcodec/h264.c
	libavcodec/h264.h
	libavcodec/h264_cavlc.c
	libavcodec/h264_loopfilter.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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