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 '92fdc80cab2acad9f171ba38a08aa89b392bdadd' 

* commit '92fdc80cab2acad9f171ba38a08aa89b392bdadd':
  nvenc: Fix NV12 input

Conflicts:
	libavcodec/nvenc.c

Not merged, the changed code is not in FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.8
Michael Niedermayer 10 years ago
parent
a4d76faf45 92fdc80cab
commit
1221b7df68
Split View
Diff Options
Show Stats Download Patch File Download Diff File

Diff Content Not Available