Merge commit 'eb02387add350f2b34a3e61539fe25ec6213eb18'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 3 Oct 2015 10:43:46 +0000 (12:43 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 3 Oct 2015 10:43:46 +0000 (12:43 +0200)
commitf5af92edb9218ead9008db5f59bd9aa39e645539
treebf640b254616024bb42e8569a798ea5ce493d6bb
parent4e67382d72982a0670062f2f7e0567036d038c6e
parenteb02387add350f2b34a3e61539fe25ec6213eb18
Merge commit 'eb02387add350f2b34a3e61539fe25ec6213eb18'

* commit 'eb02387add350f2b34a3e61539fe25ec6213eb18':
  x264: Expose the NV21 input support

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>