[FFmpeg-cvslog] Merge commit '8161220eee152dad8b2ea9e2755c78c8e127f747'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Mon Nov  2 11:58:38 2015 +0100| [23dffc7b54c2c46502a42fe263b5ff99522173ea] | committer: Hendrik Leppkes

Merge commit '8161220eee152dad8b2ea9e2755c78c8e127f747'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=23dffc7b54c2c46502a42fe263b5ff99522173ea
---