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)
* commit '6ac0e7818399a57e4684202bac79f35b3561ad1e':
  mpeg4videodec: raise an error if sprite_trajectory.table is NULL

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

Simple merge