[FFmpeg-cvslog] Merge commit 'd005ccc630e42daab8ec2afecf972d1551a9401a'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Tue Feb 16 19:49:51 2016 +0000| [fab8d9717c9c6fe5aa29e9ef1c43bb70f234b8ba] | committer: Derek Buitenhuis

Merge commit 'd005ccc630e42daab8ec2afecf972d1551a9401a'

This commit is a no-op. Ours should be superior.

* commit 'd005ccc630e42daab8ec2afecf972d1551a9401a':
  nvenc: rename a misnamed function
  nvenc: merge input and output surface structs
  nvenc: factor out the pixel format list

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fab8d9717c9c6fe5aa29e9ef1c43bb70f234b8ba
---