Merge commit '0956fd460681e8ccbdae19f135f0d3970bf95c2f'
authorMark Thompson <sw@jkqxz.net>
Sun, 12 Mar 2017 15:19:52 +0000 (15:19 +0000)
committerMark Thompson <sw@jkqxz.net>
Sun, 12 Mar 2017 15:19:52 +0000 (15:19 +0000)
commit80fa5a0bcc13375711d9901f6ac7d8bdcc10a883
treecddbd09e9d7c18e9b87e9302a53e9bbe9cf3ca00
parent15887a410c5ae271c59e5bc6d60ae443e6c40ac7
parent0956fd460681e8ccbdae19f135f0d3970bf95c2f
Merge commit '0956fd460681e8ccbdae19f135f0d3970bf95c2f'

* commit '0956fd460681e8ccbdae19f135f0d3970bf95c2f':
  qsvenc: do not re-execute encoding on all positive status codes

Noop, see fb240a6276fa36fe120aadd67b4ca774e354f22b.

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