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)
* commit 'bd3e460b73dd54a68dc253e010c239cefc8d8d55':
  h264: move direct_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