[FFmpeg-cvslog] Merge commit '7a5f44476696b495e0de658ed859bcb8520b93d4'

Michael Niedermayer git at videolan.org
Tue Apr 14 20:45:34 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Apr 14 20:09:44 2015 +0200| [ee69229dd806709a51b70184640c2f298cd99d2b] | committer: Michael Niedermayer

Merge commit '7a5f44476696b495e0de658ed859bcb8520b93d4'

* commit '7a5f44476696b495e0de658ed859bcb8520b93d4':
  avisynth: Bump minimum required version to interface version 6

Conflicts:
	doc/general.texi
	libavformat/avisynth.c

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

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





More information about the ffmpeg-cvslog mailing list