Merge commit '45c4bf3df03ef53ae61fa1473424d4ae024f22e4'
authorJames Almer <jamrial@gmail.com>
Wed, 8 Nov 2017 17:15:16 +0000 (14:15 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 8 Nov 2017 17:23:48 +0000 (14:23 -0300)
commitbc987cf91dd9975b0949bb5f91b9f266ca53e0ff
tree576c2374596c851ce3c45a04d52466e7acf3198e
parent5fd6fa0ca7f32d800a6044d28fb33a88e8de7283
parent45c4bf3df03ef53ae61fa1473424d4ae024f22e4
Merge commit '45c4bf3df03ef53ae61fa1473424d4ae024f22e4'

* commit '45c4bf3df03ef53ae61fa1473424d4ae024f22e4':
  h264dec: track the last seen value of x264_build

Merged-by: James Almer <jamrial@gmail.com>
libavcodec/h264_cabac.c
libavcodec/h264_direct.c
libavcodec/h264_mb.c
libavcodec/h264_slice.c
libavcodec/h264dec.c
libavcodec/h264dec.h