Merge commit 'b667252a41fbf5a3f6ea8c67fdbc03db3d748977'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 26 Apr 2016 13:07:03 +0000 (14:07 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 26 Apr 2016 13:07:03 +0000 (14:07 +0100)
commit438ed974b832634c544facaf6de3a23e9e7d774a
treee64ec8adb4d53435a816df57839693a44a7a690d
parentb5c10c4c9274b06a7bd6f6e1f0f4c129aa6e892c
parentb667252a41fbf5a3f6ea8c67fdbc03db3d748977
Merge commit 'b667252a41fbf5a3f6ea8c67fdbc03db3d748977'

* commit 'b667252a41fbf5a3f6ea8c67fdbc03db3d748977':
  h2645_parse: add support for parsing h264

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavcodec/h2645_parse.c
libavcodec/h2645_parse.h
libavcodec/hevc.c
libavcodec/hevc_parser.c