[FFmpeg-cvslog] Merge commit 'd161ae0a37900cbd36c1390ca32a56b892c02ab5'

Michael Niedermayer git at videolan.org
Mon Mar 24 15:00:14 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 24 14:51:44 2014 +0100| [3e1f24131ac018c8b4bcc852a02ccfadf20d1dbb] | committer: Michael Niedermayer

Merge commit 'd161ae0a37900cbd36c1390ca32a56b892c02ab5'

* commit 'd161ae0a37900cbd36c1390ca32a56b892c02ab5':
  frame: add a function for removing side data from a frame

Conflicts:
	libavutil/version.h

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

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





More information about the ffmpeg-cvslog mailing list