Merge commit '70b1dcef2d859ae6b3e21d61de928c3dd0cf1aa4'
authorJames Almer <jamrial@gmail.com>
Mon, 1 Aug 2016 16:02:20 +0000 (13:02 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 1 Aug 2016 16:02:20 +0000 (13:02 -0300)
commit9ee1f033656374a9f7c9bddcfd85739614580d62
treeae6b3c2ac05ade8deebde1b8f9173baea5a97507
parent8c7932884d09bc580036640453fd6b7ad4dd77b4
parent70b1dcef2d859ae6b3e21d61de928c3dd0cf1aa4
Merge commit '70b1dcef2d859ae6b3e21d61de928c3dd0cf1aa4'

* commit '70b1dcef2d859ae6b3e21d61de928c3dd0cf1aa4':
  h264: tighten the valid range for ref_frame_count

Conflicts:
libavcodec/h264_ps.c

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