Merge commit '23e85be58fc64b2e804e68b0034a08a6d257e523'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 21 Mar 2013 12:06:14 +0000 (13:06 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 21 Mar 2013 12:06:14 +0000 (13:06 +0100)
commit86d9d349cce54984ef7f4b67647ae73bf1c48f88
treef1a65e0d48eb386d67b993fd9e56ddf3051614cd
parent92656787cfeaf28af368bd4c20ffbaedc8ad3ca9
parent23e85be58fc64b2e804e68b0034a08a6d257e523
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@gmx.at>
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_loopfilter.c
libavcodec/h264_mb_template.c
libavcodec/h264_mvpred.h