diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-03 01:18:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-03 01:18:54 +0100 |
| commit | 7ca10d10aae32fa42b6afc486328a7ec017bd457 (patch) | |
| tree | 4166767dd61134388da12cf5cf7b5103a81711fb /libavcodec | |
| parent | a3ab87427c53aa7dfcc9f235848e555b9d99b06f (diff) | |
| parent | 355d01a1bf55297b1d1f04e4bfbf0ddc93b6247e (diff) | |
| download | ffmpeg-7ca10d10aae32fa42b6afc486328a7ec017bd457.tar.gz | |
Merge commit '355d01a1bf55297b1d1f04e4bfbf0ddc93b6247e'
* commit '355d01a1bf55297b1d1f04e4bfbf0ddc93b6247e':
movenc: Factorize writing ftyp and other identification tags to a separate function
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
0 files changed, 0 insertions, 0 deletions