[FFmpeg-cvslog] Merge commit '7c1e2e64667421f931ab48141517f19d309c7eea'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar  1 01:17:10 2015 +0100| [7e5300958885e8d7e81e4e0183580558183a9a5e] | committer: Michael Niedermayer

Merge commit '7c1e2e64667421f931ab48141517f19d309c7eea'

* commit '7c1e2e64667421f931ab48141517f19d309c7eea':
  rtpenc_xiph: Use AV_WB16 instead of manual bitshifts

Conflicts:
	libavformat/rtpenc_xiph.c

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

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