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)
commit20608261f7818fc034f96034a089e755f095716e
treec9b3a648ac6206745f42555969ef89a5ffaf996d
parent7e3c4d029b8ecf17f3ae17ad6861730a9393ef09
parent3d6e76b953afd36e23ef8532b81aea58a6338931
Merge commit '3d6e76b953afd36e23ef8532b81aea58a6338931'

* commit '3d6e76b953afd36e23ef8532b81aea58a6338931':
  qsvenc: Fix a typo of FrameRateExtD/FrameRateExtN

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