[FFmpeg-cvslog] Merge commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111'

Michael Niedermayer git at videolan.org
Tue Mar 12 15:41:30 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 12 15:29:20 2013 +0100| [a75f01d7e0bf166a0b443eb15621753619bb8d88] | committer: Michael Niedermayer

Merge commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111'

* commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111':
  Add the bumps and APIchanges entries for reference counted buffers changes.

Conflicts:
	Changelog
	doc/APIchanges
	libavcodec/version.h
	libavdevice/version.h
	libavfilter/version.h
	libavformat/version.h

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

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





More information about the ffmpeg-cvslog mailing list