Merge commit '4c6836db0f300d2c0401c6a1927a95c3258cc1ae'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 8 May 2016 22:27:18 +0000 (23:27 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 8 May 2016 22:27:22 +0000 (23:27 +0100)
commitf0d4f3026d0fabeaa600bee493d5e85996445c3d
tree48e38cc899aadef5bf22ded8d1f18ccb5c97cb88
parentee865e9780b40294f073d590f66f7df54745ad9f
parent4c6836db0f300d2c0401c6a1927a95c3258cc1ae
Merge commit '4c6836db0f300d2c0401c6a1927a95c3258cc1ae'

This commit is a no-op.

* commit '4c6836db0f300d2c0401c6a1927a95c3258cc1ae':
  nvenc_h264: Fix name of private AVClass

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