ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri Jul 10
02:15:54 2015 +0200| [60c6959b6bf853d7e4c2728000b89b2f4682278a] | committer:
Michael Niedermayer
Merge commit '461b45efd04859b2672238bc8a6ecab9e9a14948'
* commit '461b45efd04859b2672238bc8a6ecab9e9a14948':
lavc: Add nvenc.h to the skipheader
Conflicts:
libavcodec/Makefile
No change as there is no nvenc.h in FFmpeg
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=60c6959b6bf853d7e4c2728000b89b2f4682278a
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
