From: James Almer Date: Wed, 27 Sep 2017 23:29:20 +0000 (-0300) Subject: Merge commit 'a52976c0feab6e86138983c248bd01fa45cdda69' X-Git-Tag: n3.5-dev~194 X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/91feb62b3dbfb49632e69ebc1cb4ffff6a22eac5 Merge commit 'a52976c0feab6e86138983c248bd01fa45cdda69' * commit 'a52976c0feab6e86138983c248bd01fa45cdda69': nvenc: make gpu indices independent of supported capabilities This commit is a noop, see 5403d90f32656719a766254d77bbe4411e473eed Merged-by: James Almer --- 91feb62b3dbfb49632e69ebc1cb4ffff6a22eac5