[FFmpeg-cvslog] Merge commit '0e2c3ee9a335d8a0a5edf0509e222e804d7b2619'

Michael Niedermayer git at videolan.org
Mon Mar 24 13:37:29 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 24 13:27:33 2014 +0100| [bd34e26b27e9ec83727dedd1c04c40d8a245cfa8] | committer: Michael Niedermayer

Merge commit '0e2c3ee9a335d8a0a5edf0509e222e804d7b2619'

* commit '0e2c3ee9a335d8a0a5edf0509e222e804d7b2619':
  lavc: give a typedeffed name to the AVPacket.side_data struct

Conflicts:
	doc/APIchanges
	libavcodec/version.h

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

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





More information about the ffmpeg-cvslog mailing list