ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Mon Mar 23
20:33:09 2015 +0100| [ad3c5ff347a88e6a3409cee83b6e92d453e5023e] | committer:
Michael Niedermayer
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 <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ad3c5ff347a88e6a3409cee83b6e92d453e5023e
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
