Merge commit 'e9b2383bf86b38ad18a001801aee20c8182e29bd'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 17:07:01 +0000 (18:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 17:07:01 +0000 (18:07 +0100)
commit9d0450ae943a7d1071fa59bfd0c4f7647d733c5f
treed1ebfb43b856fa79589c3e67580e7e6deb631c1b
parentd511dc653062502ac7a86d9ef47ffeabd6f77364
parente9b2383bf86b38ad18a001801aee20c8182e29bd
Merge commit 'e9b2383bf86b38ad18a001801aee20c8182e29bd'

* commit 'e9b2383bf86b38ad18a001801aee20c8182e29bd':
  h264: move mb_mbaff into the per-slice context

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_mb.c
libavcodec/h264_slice.c