Merge commit 'aaf937ee'
* commit 'aaf937ee': 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>
Showing
Please
register
or
sign in
to comment