[FFmpeg-cvslog] Merge commit '92fdc80cab2acad9f171ba38a08aa89b392bdadd'
Michael Niedermayer
git at videolan.org
Sat Jun 27 00:08:39 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun 26 23:58:51 2015 +0200| [1221b7df6817e4d2603e7ca8c226ce0e13eee5bb] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1221b7df6817e4d2603e7ca8c226ce0e13eee5bb
---
More information about the ffmpeg-cvslog
mailing list