[FFmpeg-cvslog] Merge commit '4c6836db0f300d2c0401c6a1927a95c3258cc1ae'

Derek Buitenhuis git at videolan.org
Mon May 9 00:27:55 CEST 2016

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Sun May  8 23:27:18 2016 +0100| [f0d4f3026d0fabeaa600bee493d5e85996445c3d] | committer: Derek Buitenhuis

Merge commit '4c6836db0f300d2c0401c6a1927a95c3258cc1ae'

This commit is a no-op.

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

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

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

More information about the ffmpeg-cvslog mailing list