mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-03-17 20:17:55 +02:00
Merge commit '31e558fbcfec8fa9fddf564ab8360384706e41c0'
* commit '31e558fbcfec8fa9fddf564ab8360384706e41c0': isom: add "NO16" FourCC Conflicts: libavformat/isom.c See: 96e25073637f1fdc4818e193e74c38570c390d70 Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
d32245e5b1