[FFmpeg-cvslog] Merge commit 'bd3e460b73dd54a68dc253e010c239cefc8d8d55'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 21 15:58:46 2015 +0100| [ad6cee117e83711bf57e8dd90472543dbd61b8b8] | committer: Michael Niedermayer

Merge commit 'bd3e460b73dd54a68dc253e010c239cefc8d8d55'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ad6cee117e83711bf57e8dd90472543dbd61b8b8
---