Merge commit '6d2b6f21eb45ffbda1103c772060303648714832'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 21 Mar 2013 11:58:00 +0000 (12:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 21 Mar 2013 11:58:00 +0000 (12:58 +0100)
commit92656787cfeaf28af368bd4c20ffbaedc8ad3ca9
treee02cc36e4c072e410ff7252b5599f56f186623ed
parentbf4d0f8328c8f64611ca44a6ffdc30ca4f028249
parent6d2b6f21eb45ffbda1103c772060303648714832
Merge commit '6d2b6f21eb45ffbda1103c772060303648714832'

* commit '6d2b6f21eb45ffbda1103c772060303648714832':
  h264: add a parameter to the CABAC macro.
  h264: add a parameter to the FIELD_OR_MBAFF_PICTURE macro.

Conflicts:
libavcodec/h264.c
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dxva2_h264.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_loopfilter.c
libavcodec/h264_mvpred.h
libavcodec/vaapi_h264.c