Merge commit '5355ed6b20e941430c4f8fb82644e87a65366d61'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 12:35:02 +0000 (13:35 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 12:35:05 +0000 (13:35 +0100)
* commit '5355ed6b20e941430c4f8fb82644e87a65366d61':
  h264: move {prev,next}_mb_skipped 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_mvpred.h

Simple merge
Simple merge
Simple merge
Simple merge