projects / ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9f4a41b 1e7ff5a)
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)
* 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>

Trivial merge
FFmpeg git repo