Merge commit 'bd3e460b73dd54a68dc253e010c239cefc8d8d55'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 14:58:46 +0000 (15:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 14:58:50 +0000 (15:58 +0100)
commitad6cee117e83711bf57e8dd90472543dbd61b8b8
tree05b1168749cbb4487c00c7aa13084c7271aa67bd
parent6a2e1ff02a784ea69fb1a6f71d3357d705506506
parentbd3e460b73dd54a68dc253e010c239cefc8d8d55
Merge commit 'bd3e460b73dd54a68dc253e010c239cefc8d8d55'

* commit 'bd3e460b73dd54a68dc253e010c239cefc8d8d55':
  h264: move direct_cache into the per-slice context

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