Merge commit '6479c79f5517e2881bc881e737b2dbce69553878'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 14:58:01 +0000 (15:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 14:58:05 +0000 (15:58 +0100)
* commit '6479c79f5517e2881bc881e737b2dbce69553878':
  h264: move mvd_cache into the per-slice context

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

Simple merge
Simple merge
Simple merge