Merge commit '996f13413b0415097e2a184d161462ffb3ceb647'
authorJames Almer <jamrial@gmail.com>
Mon, 1 Aug 2016 22:11:08 +0000 (19:11 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 1 Aug 2016 22:11:08 +0000 (19:11 -0300)
commit01f0598b18e92b34b56393f8a148faf497ae9c15
tree143e2b4daff2dc1d767f67394f35e393b84d3c40
parentbea17a3d57053e77a9b3f46291f9d620dd76f7a2
parent996f13413b0415097e2a184d161462ffb3ceb647
Merge commit '996f13413b0415097e2a184d161462ffb3ceb647'

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

Conflicts:
libavcodec/h264_slice.c

See ef8f6464a55db730cab8c48a1a51fa4e6ca12107

Merged-by: James Almer <jamrial@gmail.com>
libavcodec/h264_slice.c