diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 22:15:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 22:15:32 +0100 |
| commit | d32245e5b12cd3c8aa8740585db950bfa628e69d (patch) | |
| tree | cabb58f365838f07074aa48a8290b706232aacc1 /libavfilter | |
| parent | 2030b3a4abd8092d746853fdf021c179c0e01021 (diff) | |
| parent | 31e558fbcfec8fa9fddf564ab8360384706e41c0 (diff) | |
| download | ffmpeg-d32245e5b12cd3c8aa8740585db950bfa628e69d.tar.gz | |
Merge commit '31e558fbcfec8fa9fddf564ab8360384706e41c0'
* commit '31e558fbcfec8fa9fddf564ab8360384706e41c0':
isom: add "NO16" FourCC
Conflicts:
libavformat/isom.c
See: 96e25073637f1fdc4818e193e74c38570c390d70
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
0 files changed, 0 insertions, 0 deletions