diff options
author | James Almer <jamrial@gmail.com> | 2017-04-13 17:20:50 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-04-13 17:20:50 -0300 |
commit | 8c71d1b06028b1de2558647f7db7421d1c6e9bee (patch) | |
tree | 5963eaa3df37f4c446259b1a53fa00ffbea5c798 /Makefile | |
parent | 5dba808064e7879c04d3e2fb4f10e709bedf51c2 (diff) | |
parent | 6bd9590b33742f1cceecc0c0d81b3caf3d8a4e1a (diff) | |
download | ffmpeg-8c71d1b06028b1de2558647f7db7421d1c6e9bee.tar.gz |
Merge commit '6bd9590b33742f1cceecc0c0d81b3caf3d8a4e1a'
* commit '6bd9590b33742f1cceecc0c0d81b3caf3d8a4e1a':
build: Have old H.264/HEVC nvenc encoders select their new counterparts
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions