Merge commit '6ac0e7818399a57e4684202bac79f35b3561ad1e'
authorJames Almer <jamrial@gmail.com>
Thu, 26 Oct 2017 19:19:43 +0000 (16:19 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 26 Oct 2017 19:19:43 +0000 (16:19 -0300)
commitaf0505ed951505485f54c65decde2232385314f0
treeea9ebbbe6227a5d1e0ea1bf84ff0265becb6410b
parentcdba33c45f79900a5dc6c5699acd4b7bdef78745
parent6ac0e7818399a57e4684202bac79f35b3561ad1e
Merge commit '6ac0e7818399a57e4684202bac79f35b3561ad1e'

* commit '6ac0e7818399a57e4684202bac79f35b3561ad1e':
  mpeg4videodec: raise an error if sprite_trajectory.table is NULL

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