Merge commit '7486418683bd2477772e03aab573cf846c12fb0d'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 27 Jan 2016 19:39:52 +0000 (19:39 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 27 Jan 2016 19:39:52 +0000 (19:39 +0000)
commite87ace6246fc6528a9a8304abdb81858c70cefb7
tree480691ea02565f0c99ed940a1cc72a293c79f4e0
parentf97d2d210553d64dccdc07da1eb9923fb46c5fcc
parent7486418683bd2477772e03aab573cf846c12fb0d
Merge commit '7486418683bd2477772e03aab573cf846c12fb0d'

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