diff options
author | Derek Buitenhuis <[email protected]> | 2016-05-08 23:27:18 +0100 |
---|---|---|
committer | Derek Buitenhuis <[email protected]> | 2016-05-08 23:27:22 +0100 |
commit | f0d4f3026d0fabeaa600bee493d5e85996445c3d (patch) | |
tree | 48e38cc899aadef5bf22ded8d1f18ccb5c97cb88 /ffmpeg.c | |
parent | ee865e9780b40294f073d590f66f7df54745ad9f (diff) | |
parent | 4c6836db0f300d2c0401c6a1927a95c3258cc1ae (diff) |
Merge commit '4c6836db0f300d2c0401c6a1927a95c3258cc1ae'
This commit is a no-op.
* commit '4c6836db0f300d2c0401c6a1927a95c3258cc1ae':
nvenc_h264: Fix name of private AVClass
Merged-by: Derek Buitenhuis <[email protected]>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions