Merge commit 'da6be8fcec16a94d8084bda8bb8a0a411a96bcf7'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 21 Mar 2013 11:43:32 +0000 (12:43 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 21 Mar 2013 11:43:32 +0000 (12:43 +0100)
commite168b508163d7dc05176d81e6b5ea73ac23eb38b
treed6fc72152fcc1e94a4b101380bdf62a28432d564
parent137df692fc28710aa1a21856b1f5b9e157896fef
parentda6be8fcec16a94d8084bda8bb8a0a411a96bcf7
Merge commit 'da6be8fcec16a94d8084bda8bb8a0a411a96bcf7'

* commit 'da6be8fcec16a94d8084bda8bb8a0a411a96bcf7':
  h264: add a parameter to the MB_FIELD macro.
  h264: add a parameter to the MB_MBAFF macro.

Conflicts:
libavcodec/h264.c
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.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