[FFmpeg-cvslog] Merge commit 'b94ec30428b9696f99b08055735689623fe63954'

Michael Niedermayer git at videolan.org
Mon Jul 27 23:34:26 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Mon Jul 27 23:21:23 2015 +0200| [e3ec2cde2c394af6c9b64bccd39bc206a88a4e58] | committer: Michael Niedermayer

Merge commit 'b94ec30428b9696f99b08055735689623fe63954'

* commit 'b94ec30428b9696f99b08055735689623fe63954':
  lavc: Update version and APIchanges

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/version.h

Merged-by: Michael Niedermayer <michael at niedermayer.cc>

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





More information about the ffmpeg-cvslog mailing list