From: Clément Bœsch Date: Thu, 23 Mar 2017 11:11:05 +0000 (+0100) Subject: Merge commit 'cbd84b8a51aa656d71b7d6ed44bd89041ff081a8' X-Git-Tag: n3.3~414 X-Git-Url: https://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=1b2a7f42c0a0dce84e2c74e93d03f7ef648eb140;hp=-c Merge commit 'cbd84b8a51aa656d71b7d6ed44bd89041ff081a8' * commit 'cbd84b8a51aa656d71b7d6ed44bd89041ff081a8': nvenc: Fix error log This commit is a noop, the error message is correct in FFmpeg. Merged-by: Clément Bœsch --- 1b2a7f42c0a0dce84e2c74e93d03f7ef648eb140