[FFmpeg-cvslog] Merge commit '3ecbd911ff9177097820e5d00401c9bf29e5d167' into release/1.1

Fri Aug 8 13:59:29 CEST 2014

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Fri Aug  8 13:47:08 2014 +0200| [53c3abc1083d630cb50427e09783cf6ce84d4a45] | committer: Michael Niedermayer

Merge commit '3ecbd911ff9177097820e5d00401c9bf29e5d167' into release/1.1

* commit '3ecbd911ff9177097820e5d00401c9bf29e5d167':
  Update Changelog for v9.14
  Prepare for 9.14 Release

Conflicts:
	Changelog
	RELEASE

Not merged as this doesnt apply 1:1 to our releases

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

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