[FFmpeg-cvslog] Merge commit '1e7ff5ac6923996f7292c82f102c68384fbc9d97'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Tue Nov 10 17:38:09 2015 +0100| [d786cdff1ca5e24cff7207118bc6c8a4ed124cef] | committer: Hendrik Leppkes

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d786cdff1ca5e24cff7207118bc6c8a4ed124cef
---