Merge commit 'a8cbe5a0ccebf60a8a8b0aba5d5716dd54c1595c'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Nov 2016 14:17:21 +0000 (15:17 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Nov 2016 14:17:21 +0000 (15:17 +0100)
commitcca4fd477851c3ab3b4ee7da525d5eb81bbe8de1
treea536226e750685bf4dc0c2b587ebe7a62edf61fd
parent4c5c522fc1a55940e931ece665b2b249d8f39bb1
parenta8cbe5a0ccebf60a8a8b0aba5d5716dd54c1595c
Merge commit 'a8cbe5a0ccebf60a8a8b0aba5d5716dd54c1595c'

* commit 'a8cbe5a0ccebf60a8a8b0aba5d5716dd54c1595c':
  h264_ps: export actual height in MBs as SPS.mb_height

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/h264_ps.c
libavcodec/h264_ps.h
libavcodec/h264_slice.c