[FFmpeg-cvslog] Merge commit 'e352b293712ff7cbde67eba3ce3f8510b037de09'

Michael Niedermayer git at videolan.org
Tue Dec 2 22:19:20 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Dec  2 22:00:02 2014 +0100| [781a5a392c4d0da5250c28a153c14f88aad09a73] | committer: Michael Niedermayer

Merge commit 'e352b293712ff7cbde67eba3ce3f8510b037de09'

* commit 'e352b293712ff7cbde67eba3ce3f8510b037de09':
  mov: Add an option for exporting all metadata

Conflicts:
	libavformat/isom.h
	libavformat/mov.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=781a5a392c4d0da5250c28a153c14f88aad09a73
---





More information about the ffmpeg-cvslog mailing list