Merge commit 'e0046bc9c96150fa06146ace9093f06857dd7b23'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Mar 2015 19:33:09 +0000 (20:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Mar 2015 19:33:09 +0000 (20:33 +0100)
commitad3c5ff347a88e6a3409cee83b6e92d453e5023e
tree78c48e1e50a5891d63dfefd0e1c17b8526446e3b
parent67ceb42d394bcff0fd25e4e76f1a606d105334cc
parente0046bc9c96150fa06146ace9093f06857dd7b23
Merge commit 'e0046bc9c96150fa06146ace9093f06857dd7b23'

* commit 'e0046bc9c96150fa06146ace9093f06857dd7b23':
  movenc: Write the make and model metadata keys for mov style files

Conflicts:
libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/movenc.c