diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-11-10 17:38:09 +0100 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-11-10 17:38:09 +0100 |
commit | d786cdff1ca5e24cff7207118bc6c8a4ed124cef (patch) | |
tree | 83b633e5c5986c1f9a2f9a1643272fd347815a7e /libavcodec/msvideo1.c | |
parent | 9f4a41bf991916e105be9d78ed38612d3ffa4881 (diff) | |
parent | 1e7ff5ac6923996f7292c82f102c68384fbc9d97 (diff) | |
download | ffmpeg-d786cdff1ca5e24cff7207118bc6c8a4ed124cef.tar.gz |
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>
Diffstat (limited to 'libavcodec/msvideo1.c')
0 files changed, 0 insertions, 0 deletions