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 'd00a504b244e136a0c82a55e21ed94659e0674ad' 

* commit 'd00a504b244e136a0c82a55e21ed94659e0674ad':
  libx265: Update API usage

Conflicts:
	libavcodec/libx265.c

See: d373647194
Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.2-rc1
Michael Niedermayer 12 years ago
parent
a908de7f49 d00a504b24
commit
a88cbdfb90
Split View
Diff Options
Show Stats Download Patch File Download Diff File

Diff Content Not Available