mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-03-17 20:17:55 +02:00
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>
This commit is contained in:
commit
952e9fbb4a