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)
commit6a2e1ff02a784ea69fb1a6f71d3357d705506506
treea4f03cfc00291522a295c400b5c5e1b443dc8cd4
parentc9841c05be67908e0980dafe0f7585ba47cbfe28
parent6479c79f5517e2881bc881e737b2dbce69553878
Merge commit '6479c79f5517e2881bc881e737b2dbce69553878'

* commit '6479c79f5517e2881bc881e737b2dbce69553878':
  h264: move mvd_cache into the per-slice context

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