Merge commit 'a67f8ae9a2c8529bf6a635e8ca4e3483592708b1'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 14:57:21 +0000 (15:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 14:57:21 +0000 (15:57 +0100)
commitc9841c05be67908e0980dafe0f7585ba47cbfe28
tree962eb94bdac044eb1bf6f054d0c1f85f158190ec
parenta4952e7343f9a77d2995d699ac045b095ab11052
parenta67f8ae9a2c8529bf6a635e8ca4e3483592708b1
Merge commit 'a67f8ae9a2c8529bf6a635e8ca4e3483592708b1'

* commit 'a67f8ae9a2c8529bf6a635e8ca4e3483592708b1':
  h264: move mvd_table into the per-slice context

Conflicts:
libavcodec/h264.c

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