Merge commit '7fa00653a550c0d24b3951c0f9fed6350ecf5ce4'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 21 Mar 2013 11:50:18 +0000 (12:50 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 21 Mar 2013 11:50:18 +0000 (12:50 +0100)
commitbf4d0f8328c8f64611ca44a6ffdc30ca4f028249
treee37df66f9571e2753a827c23ba8c075a8af5d323
parente168b508163d7dc05176d81e6b5ea73ac23eb38b
parent7fa00653a550c0d24b3951c0f9fed6350ecf5ce4
Merge commit '7fa00653a550c0d24b3951c0f9fed6350ecf5ce4'

* commit '7fa00653a550c0d24b3951c0f9fed6350ecf5ce4':
  h264: add a parameter to the FIELD_PICTURE macro.
  h264: add a parameter to the FRAME_MBAFF macro.

Conflicts:
libavcodec/h264.c
libavcodec/h264_loopfilter.c
libavcodec/h264_refs.c

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