ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Mon Dec 8
23:01:42 2014 +0100| [885e74622e3f3be31aebee35540339c7652e723f] | committer:
Michael Niedermayer
Merge commit 'e2e07dbaab1f17e995842b7eacec4665d44c3d14'
* commit 'e2e07dbaab1f17e995842b7eacec4665d44c3d14':
mov: expand the list of parsed metadata tags
Conflicts:
libavformat/mov.c
See: 543f3db9784348499a1ac1088373e2fb9100d4c0
See: dadf668df20e041b330fa4d3c5feb32a3f495d32
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=885e74622e3f3be31aebee35540339c7652e723f
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
