Merge commit 'f1af37b51033ad90e56a8d7dfcc366f2bd9d2fed'
authorClément Bœsch <cboesch@gopro.com>
Fri, 5 May 2017 09:33:17 +0000 (11:33 +0200)
committerClément Bœsch <cboesch@gopro.com>
Fri, 5 May 2017 09:33:39 +0000 (11:33 +0200)
commit20e72faef6946cde8e59981ef511b824a01c5adb
treee35c82f841089a3e1dfd52adabbef05ec5fccf6d
parentcb0eba71f047944ccc1220fca04c50f45f88a8ff
parentf1af37b51033ad90e56a8d7dfcc366f2bd9d2fed
Merge commit 'f1af37b51033ad90e56a8d7dfcc366f2bd9d2fed'

* commit 'f1af37b51033ad90e56a8d7dfcc366f2bd9d2fed':
  h264dec: make ff_h264_decode_init() static

Merged-by: Clément Bœsch <cboesch@gopro.com>
libavcodec/h264dec.c
libavcodec/h264dec.h