Merge commit '7d8154edd594981e7891d57de91f2260f8a62939'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 12:44:38 +0000 (13:44 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 12:44:38 +0000 (13:44 +0100)
commit6abd1e901c065280d50adbbf95eb54773870328c
tree69ff8bd6a5d99e25696cf21bdb05a8b3016ffa59
parent61635c7a8822d13bc8da69e116f40738be43539a
parent7d8154edd594981e7891d57de91f2260f8a62939
Merge commit '7d8154edd594981e7891d57de91f2260f8a62939'

* commit '7d8154edd594981e7891d57de91f2260f8a62939':
  h264: move intra4x4_pred_mode[_cache] into the per-slice context

Conflicts:
libavcodec/h264.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_mvpred.h
libavcodec/h264_slice.c
libavcodec/svq3.c