Merge commit 'bc98e8c0e0a8babfea35c98855e366b29cbe1191'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 16:30:59 +0000 (17:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 17:03:54 +0000 (18:03 +0100)
commitd511dc653062502ac7a86d9ef47ffeabd6f77364
treede08d37ef2724816769b0143d3e1866129b965d6
parenta0b39747b7213b5b76c0ce5984c1dac63933737f
parentbc98e8c0e0a8babfea35c98855e366b29cbe1191
Merge commit 'bc98e8c0e0a8babfea35c98855e366b29cbe1191'

* commit 'bc98e8c0e0a8babfea35c98855e366b29cbe1191':
  h264: move mb_field_decoding_flag into the per-slice context

Conflicts:
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_loopfilter.c
libavcodec/h264_mb.c
libavcodec/h264_mb_template.c
libavcodec/h264_mvpred.h
libavcodec/h264_slice.c