Merge commit '9b09792c90b580842157ca8ce534be434725a841'
authorMark Thompson <sw@jkqxz.net>
Mon, 12 Feb 2018 23:05:13 +0000 (23:05 +0000)
committerMark Thompson <sw@jkqxz.net>
Mon, 12 Feb 2018 23:05:13 +0000 (23:05 +0000)
commitccef7a85d6491fb354a36970162fa0204217d8e7
tree3fc245c4c4532ba2338ca00fd7590ff1af7674a2
parentde3be1d09f31e0f5c72240fc0270067c5c6d2510
parent9b09792c90b580842157ca8ce534be434725a841
Merge commit '9b09792c90b580842157ca8ce534be434725a841'

* commit '9b09792c90b580842157ca8ce534be434725a841':
  lavc/qsv: default la_ds to MFX_LOOKAHEAD_DS_UNKNOWN

This commit is a noop: the code in FFmpeg is slightly different and never
contained the invalid value.

Merged-by: Mark Thompson <sw@jkqxz.net>