Merge commit '1e7ff5ac6923996f7292c82f102c68384fbc9d97'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 10 Nov 2015 16:38:09 +0000 (17:38 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 10 Nov 2015 16:38:09 +0000 (17:38 +0100)
commitd786cdff1ca5e24cff7207118bc6c8a4ed124cef
tree83b633e5c5986c1f9a2f9a1643272fd347815a7e
parent9f4a41bf991916e105be9d78ed38612d3ffa4881
parent1e7ff5ac6923996f7292c82f102c68384fbc9d97
Merge commit '1e7ff5ac6923996f7292c82f102c68384fbc9d97'

* commit '1e7ff5ac6923996f7292c82f102c68384fbc9d97':
  nut: Use the correct codec_tag when multiple are available

Not merged since ffnutenc handles the codec_tag differently

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