[FFmpeg-cvslog] Merge commit '0069d4597bda5723fbcae410784bbfa4750df706' into release/2.4

Michael Niedermayer git at videolan.org
Mon Jun 1 05:01:20 CEST 2015


ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  1 04:50:21 2015 +0200| [772787723958591f0134b846a3cc337c48978332] | committer: Michael Niedermayer

Merge commit '0069d4597bda5723fbcae410784bbfa4750df706' into release/2.4

* commit '0069d4597bda5723fbcae410784bbfa4750df706':
  Update changelog for v11.4

Conflicts:
	Changelog
	RELEASE

Not merged, our changelog differs from this

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

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





More information about the ffmpeg-cvslog mailing list