Merge commit 'cb167f2947f1a2c446bd8db196d0e64ef4a6d06b'
authorJames Almer <jamrial@gmail.com>
Mon, 30 Oct 2017 23:40:28 +0000 (20:40 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 30 Oct 2017 23:40:28 +0000 (20:40 -0300)
commit0e5a47693c4b2e77b3951c209e842b8a72b7b36b
tree30f45da66052924292afea3e60fe3fdbfdd712c8
parent0b30cb8dae5e7edb2a5f35900547321499c217f1
parentcb167f2947f1a2c446bd8db196d0e64ef4a6d06b
Merge commit 'cb167f2947f1a2c446bd8db196d0e64ef4a6d06b'

* commit 'cb167f2947f1a2c446bd8db196d0e64ef4a6d06b':
  h264_refs: validate the SPS pointer in ff_h264_execute_ref_pic_marking()

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