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)
* commit '996f13413b0415097e2a184d161462ffb3ceb647':
  h264: fix warnings in fill_filter_caches_inter()

Conflicts:
libavcodec/h264_slice.c

See ef8f6464a55db730cab8c48a1a51fa4e6ca12107

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

Simple merge