Merge commit '8161220eee152dad8b2ea9e2755c78c8e127f747'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 2 Nov 2015 10:58:38 +0000 (11:58 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 2 Nov 2015 10:58:38 +0000 (11:58 +0100)
commit23dffc7b54c2c46502a42fe263b5ff99522173ea
tree957e3c64d1dfb8848cc0791fe78ee6b6c9613220
parentc1b712e078b29c2acbcc0d558543e141152355b2
parent8161220eee152dad8b2ea9e2755c78c8e127f747
Merge commit '8161220eee152dad8b2ea9e2755c78c8e127f747'

* commit '8161220eee152dad8b2ea9e2755c78c8e127f747':
  h264_parser: Rename close() to h264_close()

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>