Merge commit '355d01a1bf55297b1d1f04e4bfbf0ddc93b6247e'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Jan 2015 00:18:54 +0000 (01:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Jan 2015 00:18:54 +0000 (01:18 +0100)
commit7ca10d10aae32fa42b6afc486328a7ec017bd457
tree4166767dd61134388da12cf5cf7b5103a81711fb
parenta3ab87427c53aa7dfcc9f235848e555b9d99b06f
parent355d01a1bf55297b1d1f04e4bfbf0ddc93b6247e
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>
libavformat/movenc.c