Merge commit 'aaf937ee3557bfb99c2ad298591b22a7f22ecbf7'
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 27 Jul 2015 22:02:37 +0000 (00:02 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 27 Jul 2015 22:02:37 +0000 (00:02 +0200)
* commit 'aaf937ee3557bfb99c2ad298591b22a7f22ecbf7':
  hap: Add utility functions file

Conflicts:
libavcodec/hap.c

No change, no files are/where missing in FFmpeg

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Trivial merge