diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-28 00:02:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-28 00:02:37 +0200 |
| commit | 952e9fbb4aaa7d424847e64514973d749d2fc931 (patch) | |
| tree | 649170b922ae4641f2519d9645db950d1a9256d2 | |
| parent | 4be1b6bef09737cef8173b619132fa13bef80818 (diff) | |
| parent | aaf937ee3557bfb99c2ad298591b22a7f22ecbf7 (diff) | |
| download | ffmpeg-streaming-952e9fbb4aaa7d424847e64514973d749d2fc931.zip ffmpeg-streaming-952e9fbb4aaa7d424847e64514973d749d2fc931.tar.gz | |
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>
0 files changed, 0 insertions, 0 deletions
