mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit 'd00a504b244e136a0c82a55e21ed94659e0674ad'
* commit 'd00a504b244e136a0c82a55e21ed94659e0674ad':
libx265: Update API usage
Conflicts:
libavcodec/libx265.c
See: d373647194
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
a88cbdfb90