Merge commit 'e0046bc9'
* commit 'e0046bc9': movenc: Write the make and model metadata keys for mov style files Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment