Merge commit '98ea98069b40c34aa7b762096f8f380012a7dd84'
authorJames Almer <jamrial@gmail.com>
Wed, 1 Nov 2017 21:51:40 +0000 (18:51 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 1 Nov 2017 21:51:40 +0000 (18:51 -0300)
commit358c886655bc354010ca7562853f5a8607654fd7
tree7f6cda0b8ed6dfadbb1372af04afc7ffc4539887
parent508fc80850225974a8d5b19f5906eadf6bd3636d
parent98ea98069b40c34aa7b762096f8f380012a7dd84
Merge commit '98ea98069b40c34aa7b762096f8f380012a7dd84'

* commit '98ea98069b40c34aa7b762096f8f380012a7dd84':
  nvenc: Add default value for AVCodecContext::refs

This commit is a noop, see d8da329cc364b36dabbb3162f788f958d8b6ea46

Merged-by: James Almer <jamrial@gmail.com>