mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit 'cca4742a5e663cfe4dbd71f01f0c0fb042fddc1d'
* commit 'cca4742a5e663cfe4dbd71f01f0c0fb042fddc1d': doc/APIchanges: mark the place where 9 was branched Conflicts: doc/APIchanges Not merged, as "9" was not a FFmpeg release and not branched anywhere from our APIChanges list Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
ee2c1e6dd3