* commit '996f1341':
  h264: fix warnings in fill_filter_caches_inter()

Conflicts:
libavcodec/h264_slice.c

See ef8f6464Merged-by: James Almer <jamrial@gmail.com>