]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '3d6e76b953afd36e23ef8532b81aea58a6338931'
authorJames Almer <jamrial@gmail.com>
Thu, 29 Mar 2018 23:32:57 +0000 (20:32 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 29 Mar 2018 23:32:57 +0000 (20:32 -0300)
* commit '3d6e76b953afd36e23ef8532b81aea58a6338931':
  qsvenc: Fix a typo of FrameRateExtD/FrameRateExtN

Merged-by: James Almer <jamrial@gmail.com>
1  2 
libavcodec/qsvenc.c

Simple merge