Merge commit '4bd5ac200d15b4f458a50f66006549825f9fc865'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 12:35:34 +0000 (13:35 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 12:35:38 +0000 (13:35 +0100)
* commit '4bd5ac200d15b4f458a50f66006549825f9fc865':
  h264: move {chroma,intra16x16}_pred_mode into the per-slice context

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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge