[FFmpeg-cvslog] Merge commit '252d6200c36e7eaa79f8d5205b7d731179e94897'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  8 01:10:11 2015 +0200| [ce838ad950fcf8b2a8823d7606a05077ebe91f9f] | committer: Michael Niedermayer

Merge commit '252d6200c36e7eaa79f8d5205b7d731179e94897'

* commit '252d6200c36e7eaa79f8d5205b7d731179e94897':
  avio: Add avio_put_str16be

Conflicts:
	doc/APIchanges
	libavformat/avio.h
	libavformat/aviobuf.c
	libavformat/version.h

The FFmpeg implementation is kept as requested by ubitux
Doxy improvements merged

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

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