Merge commit '90ed6c5cf7f236bc9efb47c97b40358c666d1386'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 26 Apr 2016 13:09:52 +0000 (14:09 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 26 Apr 2016 13:27:35 +0000 (14:27 +0100)
commit79aafd43fd255fc04e4f4db4c45d6d1f5a9b9fff
tree2d38d298ccd047ed2effd37b4ab3af3b988c37f8
parent438ed974b832634c544facaf6de3a23e9e7d774a
parent90ed6c5cf7f236bc9efb47c97b40358c666d1386
Merge commit '90ed6c5cf7f236bc9efb47c97b40358c666d1386'

* commit '90ed6c5cf7f236bc9efb47c97b40358c666d1386':
  h2645_parse: compute the actual data length, without trailing paddding

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