Merge commit '066aafced4dc6c7c9e7b37082635472249f1e93e'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 13:38:59 +0000 (14:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 13:38:59 +0000 (14:38 +0100)
commita8ac4c9b06b9f3ee73ef377a3e4392957c72c2b3
treefb5114ebcffba281026acf7503aba6aa8212da8b
parent4ffbeddd35cb6a365a3db85bb2bdf2084fb1ba55
parent066aafced4dc6c7c9e7b37082635472249f1e93e
Merge commit '066aafced4dc6c7c9e7b37082635472249f1e93e'

* commit '066aafced4dc6c7c9e7b37082635472249f1e93e':
  h264: move direct_spatial_mv_pred into the per-slice context

Conflicts:
libavcodec/h264_mvpred.h

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