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

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