[FFmpeg-cvslog] Merge commit 'ddf5fb71ee9c8b2d9a23c0f661a84896cd7050fc'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Sep 25 00:15:26 2014 +0200| [d8ddac363e77eb55150c80febc56ad58d53968e8] | committer: Michael Niedermayer

Merge commit 'ddf5fb71ee9c8b2d9a23c0f661a84896cd7050fc'

* commit 'ddf5fb71ee9c8b2d9a23c0f661a84896cd7050fc':
  rtpenc: HEVC/H.265 support

Conflicts:
	Changelog
	libavformat/rtpenc.c
	libavformat/rtpenc_hevc.c
	libavformat/version.h

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

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