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)
commit952e9fbb4aaa7d424847e64514973d749d2fc931
tree649170b922ae4641f2519d9645db950d1a9256d2
parent4be1b6bef09737cef8173b619132fa13bef80818
parentaaf937ee3557bfb99c2ad298591b22a7f22ecbf7
Merge commit 'aaf937ee3557bfb99c2ad298591b22a7f22ecbf7'

* 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>