Merge commit 'ab6422e1333e1c8b99e97ac61e3e9b2f6a2b4936'
authorJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 18:52:38 +0000 (15:52 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 18:52:38 +0000 (15:52 -0300)
commit8a5e1a4b4673b4b0e8dc8bd174386952edc892b2
tree1ab4ff9b04b9801fb34b9d1b7655df160fc1f2f1
parent93ccba96df6340249b0db227d5bc3297010797a4
parentab6422e1333e1c8b99e97ac61e3e9b2f6a2b4936
Merge commit 'ab6422e1333e1c8b99e97ac61e3e9b2f6a2b4936'

* commit 'ab6422e1333e1c8b99e97ac61e3e9b2f6a2b4936':
  configure: rename hevc_ps to hevcparse
  extract_extradata: return an error when buffer allocation fails
  cpu: split flag checks per arch in av_cpu_max_align()
  configure: Use test_pkg_config() for the SDL check

This commit is a noop, see
3b345d389be2d67017f904caa21713f53a8e8c90
7bae17e37ab63d1cfcea22c68c455f859db3663c

Merged-by: James Almer <jamrial@gmail.com>