falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

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>
tags/n2.8
Michael Niedermayer 10 years ago
parent
4be1b6bef0 aaf937ee35
commit
952e9fbb4a
Split View
Diff Options
Show Stats Download Patch File Download Diff File

Diff Content Not Available